Fixed tests based on updates

Author: tleonhardt

tests/test_cmd2.py

@@ -279,9 +279,9 @@ def test_set_with_choices(base_app) -> None:
     # Try a valid choice
     out, err = run_cmd(base_app, f"set fake {fake_choices[1]}")
     assert base_app.last_result is True
-    assert not out
-    assert err[0].startswith(f"fake: {fake_choices[0]!r}")
-    assert err[1].endswith(f"-> {fake_choices[1]!r}")
+    assert not err
+    assert out[0].startswith("fake")
+    assert out[0].endswith(f"-> {fake_choices[1]!r}")
 
     # Try an invalid choice
     _out, err = run_cmd(base_app, "set fake bad_value")
@@ -856,14 +856,13 @@ def test_allow_clipboard(base_app) -> None:
 
 def test_base_timing(base_app) -> None:
     out, err = run_cmd(base_app, "set timing True")
-    assert not out
-    assert err[0].startswith("timing: False")
-    assert err[1].endswith("-> True")
+    assert out[0].startswith("timing")
+    assert out[0].endswith("-> True")
 
     if sys.platform == "win32":
-        assert err[2].startswith("Elapsed: 0:00:00")
+        assert err[0].startswith("Elapsed: 0:00:00")
     else:
-        assert err[2].startswith("Elapsed: 0:00:00.0")
+        assert err[0].startswith("Elapsed: 0:00:00.0")
 
 
 def test_base_debug(base_app) -> None:
@@ -877,9 +876,9 @@ def test_base_debug(base_app) -> None:
 
     # Set debug true
     out, err = run_cmd(base_app, "set debug True")
-    assert not out
-    assert err[0].startswith("debug: False")
-    assert err[1].endswith("-> True")
+    assert not err
+    assert out[0].startswith("debug")
+    assert out[0].endswith("-> True")
 
     # Verify that we now see the exception traceback
     out, err = run_cmd(base_app, "edit")

tests/test_commandset.py

@@ -1103,9 +1103,9 @@ def __init__(self) -> None:
 
     # change the value and verify the value changed
     out, err = run_cmd(app, "set arbitrary_value 10")
-    assert not out
-    assert err[0].startswith("arbitrary_value: 5")
-    assert err[1].endswith("-> 10")
+    assert not err
+    assert out[0].startswith("arbitrary_value")
+    assert out[0].endswith("-> 10")
     out, err = run_cmd(app, "set arbitrary_value")
     any("arbitrary_value" in line and "10" in line for line in out)