rebase cleanup

murrayrm · murrayrm · commit 742b3320c245 · 2022-03-22T22:36:53.000-07:00
diff --git a/control/tests/optimal_test.py b/control/tests/optimal_test.py
@@ -437,7 +437,7 @@ def test_ocp_argument_errors():
             sys, time, x0, cost, constraints, initial_guess=np.zeros((4,1,1)))
 
     # Unrecognized arguments
-    with pytest.raises(ValueError, match="unrecognized keyword"):
+    with pytest.raises(TypeError, match="unrecognized keyword"):
         res = opt.solve_ocp(
             sys, time, x0, cost, constraints, terminal_constraint=None)
 
