##// END OF EJS Templates
Merge pull request #11173 from Carreau/reswarn...
Matthias Bussonnier -
r24434:5e556405 merge
parent child Browse files
Show More
@@ -546,7 +546,8 b' class ExitCodeChecks(tt.TempFileMixin):'
546 else:
546 else:
547 del os.environ['SHELL']
547 del os.environ['SHELL']
548
548
549 class TestSystemRaw(unittest.TestCase, ExitCodeChecks):
549
550 class TestSystemRaw(ExitCodeChecks, unittest.TestCase):
550 system = ip.system_raw
551 system = ip.system_raw
551
552
552 @onlyif_unicode_paths
553 @onlyif_unicode_paths
@@ -567,7 +568,7 b' class TestSystemRaw(unittest.TestCase, ExitCodeChecks):'
567 self.assertEqual(ip.user_ns['_exit_code'], -signal.SIGINT)
568 self.assertEqual(ip.user_ns['_exit_code'], -signal.SIGINT)
568
569
569 # TODO: Exit codes are currently ignored on Windows.
570 # TODO: Exit codes are currently ignored on Windows.
570 class TestSystemPipedExitCode(unittest.TestCase, ExitCodeChecks):
571 class TestSystemPipedExitCode(ExitCodeChecks, unittest.TestCase):
571 system = ip.system_piped
572 system = ip.system_piped
572
573
573 @skip_win32
574 @skip_win32
@@ -582,7 +583,7 b' class TestSystemPipedExitCode(unittest.TestCase, ExitCodeChecks):'
582 def test_exit_code_signal(self):
583 def test_exit_code_signal(self):
583 ExitCodeChecks.test_exit_code_signal(self)
584 ExitCodeChecks.test_exit_code_signal(self)
584
585
585 class TestModules(unittest.TestCase, tt.TempFileMixin):
586 class TestModules(tt.TempFileMixin, unittest.TestCase):
586 def test_extraneous_loads(self):
587 def test_extraneous_loads(self):
587 """Test we're not loading modules on startup that we shouldn't.
588 """Test we're not loading modules on startup that we shouldn't.
588 """
589 """
@@ -24,7 +24,7 b" sqlite_err_maybe = dec.module_not_available('sqlite3')"
24 SQLITE_NOT_AVAILABLE_ERROR = ('WARNING: IPython History requires SQLite,'
24 SQLITE_NOT_AVAILABLE_ERROR = ('WARNING: IPython History requires SQLite,'
25 ' your history will not be saved\n')
25 ' your history will not be saved\n')
26
26
27 class TestFileToRun(unittest.TestCase, tt.TempFileMixin):
27 class TestFileToRun(tt.TempFileMixin, unittest.TestCase):
28 """Test the behavior of the file_to_run parameter."""
28 """Test the behavior of the file_to_run parameter."""
29
29
30 def test_py_script_file_attribute(self):
30 def test_py_script_file_attribute(self):
General Comments 0
You need to be logged in to leave comments. Login now