Improve tests

These are small improvement detected during code review.

Author: marcosbento

libs/pyext/test/py_u_TestAttributeAddDelete.py

@@ -135,7 +135,7 @@ def test_suite_variable_add_delete_and_sort():
     suite.add_variable({})
     assert len(list(suite.variables)) == 0
 
-    with pytest.raises((TypeError, RuntimeError)):
+    with pytest.raises(RuntimeError):
         suite.add_variable(
             {"name": "fred", "name2": 14, "name3": list("123"), "name4": 12}
         )
@@ -560,6 +560,13 @@ def test_task_autocancel_variants():
     assert t5.get_autocancel() is not None
 
 
+def test_family_autocancel_variants():
+    f5 = ecflow.Family("f5")
+    assert f5.get_autocancel() is None
+    f5.add_autocancel(ecflow.Autocancel(1, 10, True))  # hour,minutes,relative
+    assert f5.get_autocancel() is not None
+
+
 def test_family_autoarchive_variants():
     f1 = ecflow.Family("f1")
     assert f1.get_autoarchive() is None

libs/pyext/test/py_u_TestAutoAddExtern.py

@@ -103,3 +103,32 @@ def test_auto_add_extern_for_task_inlimit_with_suite_path(defs):
     suite.add_family("f3").add_task("t1").add_inlimit("hpcd", "/obs/limits")
     suite.add_family("f4").add_task("t2").add_inlimit("c1a", "/limits")
     _expect_check_fails_then_passes(defs)
+
+
+def test_auto_add_extern_incrementally_across_multiple_check_cycles(defs):
+    """Repeatedly call check()/auto_add_externs(True) on the same, growing Defs,
+    to verify auto_add_externs behaves correctly across multiple incremental
+    invocations rather than just once against a fully pre-built Defs."""
+    suite = defs.add_suite("ext")
+
+    f1 = suite.add_family("f1")
+    f1.add_task("t").add_trigger("/a/b/c/d == complete")
+    _expect_check_fails_then_passes(defs)
+    f1.add_task("t1").add_trigger("/a/b/c/d/e:event == set")
+    _expect_check_fails_then_passes(defs)
+    f1.add_task("t2").add_trigger("/a/b/c/d/x:event")
+    _expect_check_fails_then_passes(defs)
+    f1.add_task("t3").add_trigger("/a/b/c/d/y:meter le 30")
+    _expect_check_fails_then_passes(defs)
+    f1.add_task("t4").add_trigger("/a/b/c/d/z<flag>late")
+    _expect_check_fails_then_passes(defs)
+
+    f2 = suite.add_family("f2")
+    f2.add_inlimit("hpcd", "limits")
+    _expect_check_fails_then_passes(defs)
+    f2.add_task("t").add_inlimit("sg1", "/suiteName")
+    _expect_check_fails_then_passes(defs)
+    f2.add_task("t1").add_inlimit("hpcd", "/obs/limits")
+    _expect_check_fails_then_passes(defs)
+    f2.add_task("t2").add_inlimit("c1a", "/limits")
+    _expect_check_fails_then_passes(defs)

libs/pyext/test/py_u_TestDefs.py

@@ -94,6 +94,7 @@ def test_suite_construction_and_variables():
     suite.add_variable("ECF_URL", "publications/manuals/sms")
     suite.add_limit(Limit("limitName", 10))
     suite.add_limit("limitName_2", 10)
+    assert not suite.begun(), "Suite should not have begun"
 
     clock = Clock(1, 1, 2010, False)
     clock.set_gain(1, 10, True)

libs/pyext/test/py_u_TestTutorial.py

@@ -61,12 +61,16 @@ def _compile_tutorial_text(text):
 
 
 def _remove_tutorial_artifacts():
-    for pattern in ("test_tutorial_def_*.def", "py_u_test_tutorial_*.def"):
-        for path in pathlib.Path.cwd().glob(pattern):
-            try:
-                path.unlink()
-            except OSError:
-                pass
+    # Scoped to the current process's own artifacts only (names embed os.getpid()),
+    # so concurrent invocations from the same working directory don't delete each
+    # other's in-progress files.
+    pid = os.getpid()
+    for pattern in (f"test_tutorial_def_{pid}.def", f"py_u_test_tutorial_{pid}.def"):
+        path = pathlib.Path.cwd() / pattern
+        try:
+            path.unlink()
+        except OSError:
+            pass
 
 
 def do_tear_down():