f

markovmodel · May 17, 2016 · ab4ccd7 · ab4ccd7
1 parent a902cdc
commit ab4ccd7
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/pyemma/msm/tests/test_msm_lowlevel_deprecation.py b/pyemma/msm/tests/test_msm_lowlevel_deprecation.py
@@ -27,17 +27,16 @@ def test_analysis(self):
             analysis.is_transition_matrix
 
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
         self.assertIn('analysis', cm[0].message.args[0])
 
         with warnings.catch_warnings(record=True) as cm:
             warnings.simplefilter("always")
             pyemma.msm.analysis.is_transition_matrix
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
-        self.assert
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
         self.assertIn('analysis', cm[0].message.args[0])
 
+    @unittest.skipIf(sys.version_info.major == 2, "not on py2")
     def test_warn_was_called(self):
         shim_mod = sys.modules['pyemma.msm.analysis']
         with mock.patch.object(shim_mod, '_warn') as m:
@@ -53,14 +52,16 @@ def test_estimation(self):
             estimation.count_matrix
 
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('estimation', cm[0].message.args[0])
 
         with warnings.catch_warnings(record=True) as cm:
             warnings.simplefilter("always")
             pyemma.msm.estimation.count_matrix
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('estimation', cm[0].message.args[0])
 
     def test_generation(self):
@@ -70,14 +71,16 @@ def test_generation(self):
             generation.generate_traj
 
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('generation', cm[0].message.args[0])
 
         with warnings.catch_warnings(record=True) as cm:
             warnings.simplefilter("always")
             pyemma.msm.generation.generate_traj
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('generation', cm[0].message.args[0])
 
     def test_dtraj(self):
@@ -87,14 +90,16 @@ def test_dtraj(self):
             dtraj.load_discrete_trajectory
 
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('dtraj', cm[0].message.args[0])
 
         with warnings.catch_warnings(record=True) as cm:
             warnings.simplefilter("always")
             pyemma.msm.dtraj.load_discrete_trajectory
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('dtraj', cm[0].message.args[0])
 
     def test_io(self):
@@ -104,14 +109,16 @@ def test_io(self):
             dtraj.load_discrete_trajectory
 
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('dtraj', cm[0].message.args[0])
 
         with warnings.catch_warnings(record=True) as cm:
             warnings.simplefilter("always")
             pyemma.msm.dtraj.load_discrete_trajectory
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('dtraj', cm[0].message.args[0])
 
     def test_flux(self):
@@ -121,12 +128,14 @@ def test_flux(self):
             flux.total_flux
 
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('flux', cm[0].message.args[0])
 
         with warnings.catch_warnings(record=True) as cm:
             warnings.simplefilter("always")
             pyemma.msm.flux.total_flux
         self.assertEqual(len(cm), 1)
-        self.assertTrue(isinstance(cm[0], PyEMMA_DeprecationWarning))
+        self.assertIsInstance(cm[0].message, PyEMMA_DeprecationWarning)
+
         self.assertIn('flux', cm[0].message.args[0])