Update tests to track changes in the LegacySolverWrapper

Author: jsiirola

pyomo/contrib/solver/tests/solvers/test_ipopt.py

@@ -48,7 +48,7 @@ def test_ipopt_config(self):
         self.assertIsInstance(config.executable, ExecutableData)
 
         # Test custom initialization
-        solver = SolverFactory('ipopt_v2', executable='/path/to/exe')
+        solver = SolverFactory('ipopt', executable='/path/to/exe')
         self.assertFalse(solver.config.tee)
         self.assertTrue(solver.config.executable.startswith('/path'))
 

pyomo/contrib/solver/tests/unit/test_base.py

@@ -178,7 +178,7 @@ def test_context_manager(self):
 
 class TestLegacySolverWrapper(unittest.TestCase):
     def test_class_method_list(self):
-        expected_list = ['available', 'license_is_valid', 'solve']
+        expected_list = ['available', 'config_block', 'license_is_valid', 'set_options', 'solve']
         method_list = [
             method
             for method in dir(base.LegacySolverWrapper)
@@ -207,9 +207,7 @@ def test_map_config(self):
         self.assertTrue(instance.config.tee)
         self.assertFalse(instance.config.load_solutions)
         self.assertEqual(instance.config.time_limit, 20)
-        # Report timing shouldn't be created because it no longer exists
-        with self.assertRaises(AttributeError):
-            print(instance.config.report_timing)
+        self.assertEqual(instance.config.report_timing, True)
         # Keepfiles should not be created because we did not declare keepfiles on
         # the original config
         with self.assertRaises(AttributeError):