From 11eb7b9e23603b3e4a1d10759a9e40b84aedf7fc 2015-05-01 01:04:00 From: Thomas Kluyver Date: 2015-05-01 01:04:00 Subject: [PATCH] Merge pull request #8388 from Carreau/nightly run test on 3.5 --- diff --git a/.travis.yml b/.travis.yml index 1d6a796..aaeea1b 100644 --- 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 index 052df25..afe6544 100644 --- a/IPython/core/tests/test_interactiveshell.py +++ b/IPython/core/tests/test_interactiveshell.py @@ -50,6 +50,9 @@ ip = get_ipython() # 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 @@ class InteractiveShellTestCase(unittest.TestCase): msg = ip.get_exception_only() self.assertEqual(msg, 'KeyboardInterrupt\n') - class DerivedInterrupt(KeyboardInterrupt): - pass try: raise DerivedInterrupt("foo") except KeyboardInterrupt: