Merge pull request #6556 from takluyver/inproc-kernel-tests-better-assets

Use some more informative asserts in inprocess kernel tests

IPython/kernel/inprocess/tests/test_kernel.py

@@ -46,7 +46,7 b' class InProcessKernelTestCase(unittest.TestCase):'
         kc = self.kc
         kc.execute('%pylab')
         msg = get_stream_message(kc)
-        self.assert_('matplotlib' in msg['content']['data'])
+        self.assertIn('matplotlib', msg['content']['data'])
 
     def test_raw_input(self):
         """ Does the in-process kernel handle raw_input correctly?

IPython/kernel/inprocess/tests/test_kernelmanager.py

@@ -32,7 +32,7 b' class InProcessKernelManagerTestCase(unittest.TestCase):'
 
         old_kernel = km.kernel
         km.restart_kernel()
-        self.assert_(km.kernel is not None)
+        self.assertIsNotNone(km.kernel)
         self.assertNotEquals(km.kernel, old_kernel)
 
         km.shutdown_kernel()