Merge pull request #8388 from Carreau/nightly

run test on 3.5
ipython · May 1, 2015 · 11eb7b9 · 11eb7b9
2 parents fe4eb8d + 306e3c2
commit 11eb7b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,14 @@
 # http://travis-ci.org/#!/ipython/ipython
 language: python
 python:
+    - "nightly"
     - 3.4
     - 3.3
     - 2.7
 sudo: false
+matrix:
+    allow_failures:
+        - python : "nightly"
 before_install:
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
     - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
@@ -50,6 +50,9 @@
 # Tests
 #-----------------------------------------------------------------------------
 
+class DerivedInterrupt(KeyboardInterrupt):
+    pass
+
 class InteractiveShellTestCase(unittest.TestCase):
     def test_naked_string_cells(self):
         """Test that cells with only naked strings are fully executed"""
@@ -502,8 +505,6 @@ def test_get_exception_only(self):
             msg = ip.get_exception_only()
         self.assertEqual(msg, 'KeyboardInterrupt\n')
 
-        class DerivedInterrupt(KeyboardInterrupt):
-            pass
         try:
             raise DerivedInterrupt("foo")
         except KeyboardInterrupt: