##// END OF EJS Templates
Merge pull request #8388 from Carreau/nightly...
Thomas Kluyver -
r21322:11eb7b9e merge
parent child Browse files
Show More
@@ -1,10 +1,14 b''
1 # http://travis-ci.org/#!/ipython/ipython
1 # http://travis-ci.org/#!/ipython/ipython
2 language: python
2 language: python
3 python:
3 python:
4 - "nightly"
4 - 3.4
5 - 3.4
5 - 3.3
6 - 3.3
6 - 2.7
7 - 2.7
7 sudo: false
8 sudo: false
9 matrix:
10 allow_failures:
11 - python : "nightly"
8 before_install:
12 before_install:
9 - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
13 - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
10 - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
14 - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
@@ -50,6 +50,9 b' ip = get_ipython()'
50 # Tests
50 # Tests
51 #-----------------------------------------------------------------------------
51 #-----------------------------------------------------------------------------
52
52
53 class DerivedInterrupt(KeyboardInterrupt):
54 pass
55
53 class InteractiveShellTestCase(unittest.TestCase):
56 class InteractiveShellTestCase(unittest.TestCase):
54 def test_naked_string_cells(self):
57 def test_naked_string_cells(self):
55 """Test that cells with only naked strings are fully executed"""
58 """Test that cells with only naked strings are fully executed"""
@@ -502,8 +505,6 b' class InteractiveShellTestCase(unittest.TestCase):'
502 msg = ip.get_exception_only()
505 msg = ip.get_exception_only()
503 self.assertEqual(msg, 'KeyboardInterrupt\n')
506 self.assertEqual(msg, 'KeyboardInterrupt\n')
504
507
505 class DerivedInterrupt(KeyboardInterrupt):
506 pass
507 try:
508 try:
508 raise DerivedInterrupt("foo")
509 raise DerivedInterrupt("foo")
509 except KeyboardInterrupt:
510 except KeyboardInterrupt:
General Comments 0
You need to be logged in to leave comments. Login now