Use context manager for catching errors.

Author: tillahoffmann

test/test_generate_quantities.py

@@ -480,11 +480,9 @@ def test_timeout(self):
         stan = os.path.join(DATAFILES_PATH, 'timeout.stan')
         timeout_model = CmdStanModel(stan_file=stan)
         fit = timeout_model.sample(data={'loop': 0}, chains=1, iter_sampling=10)
-        self.assertRaisesRegex(
-            RuntimeError, 'processing timed out',
-            timeout_model.generate_quantities, timeout=0.1,
-            mcmc_sample=fit, data={'loop': 1},
-        )
+        with self.assertRaisesRegex(RuntimeError, 'processing timed out'):
+            timeout_model.generate_quantities(timeout=0.1, mcmc_sample=fit,
+                                              data={'loop': 1})
 
 
 if __name__ == '__main__':

test/test_optimize.py

@@ -637,10 +637,8 @@ def test_attrs(self):
     def test_timeout(self):
         stan = os.path.join(DATAFILES_PATH, 'timeout.stan')
         timeout_model = CmdStanModel(stan_file=stan)
-        self.assertRaisesRegex(
-            RuntimeError, 'processing timed out', timeout_model.optimize,
-            data={'loop': 1}, timeout=0.1,
-        )
+        with self.assertRaisesRegex(RuntimeError, 'processing timed out'):
+            timeout_model.optimize(data={'loop': 1}, timeout=0.1)
 
 
 if __name__ == '__main__':

test/test_sample.py

@@ -1916,10 +1916,8 @@ def test_diagnostics(self):
     def test_timeout(self):
         stan = os.path.join(DATAFILES_PATH, 'timeout.stan')
         timeout_model = CmdStanModel(stan_file=stan)
-        self.assertRaisesRegex(
-            RuntimeError, 'processing timed out', timeout_model.sample,
-            timeout=0.1, chains=1, data={'loop': 1},
-        )
+        with self.assertRaisesRegex(RuntimeError, 'processing timed out'):
+            timeout_model.sample(timeout=0.1, chains=1, data={'loop': 1})
 
 
 if __name__ == '__main__':

test/test_variational.py

@@ -294,10 +294,8 @@ def test_attrs(self):
     def test_timeout(self):
         stan = os.path.join(DATAFILES_PATH, 'timeout.stan')
         timeout_model = CmdStanModel(stan_file=stan)
-        self.assertRaisesRegex(
-            RuntimeError, 'processing timed out', timeout_model.variational,
-            timeout=0.1, data={'loop': 1}, show_console=True,
-        )
+        with self.assertRaisesRegex(RuntimeError, 'processing timed out'):
+            timeout_model.variational(timeout=0.1, data={'loop': 1})
 
 
 if __name__ == '__main__':