Skip to content

Keep node test definitions alive #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcosbento merged 1 commit into from
Jul 24, 2026
+19 −14
Merged

Keep node test definitions alive #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libs/pyext/test/py_u_TestAttributeAddDeleteError.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

@pytest.fixture
def suite():
return Defs().add_suite("s1")
defs = Defs()
yield defs.add_suite("s1")


def test_suite_disallows_today_string(suite):
Expand Down
12 changes: 8 additions & 4 deletions libs/pyext/test/py_u_TestError.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,8 @@ def test_cannot_add_same_family_to_two_suites():
suite = defs3.add_suite("s1")
family = suite.add_family("f1")
with pytest.raises(RuntimeError):
new_suite = Defs().add_suite("s2")
new_defs = Defs()
new_suite = new_defs.add_suite("s2")
new_suite.add_family(family)


Expand All @@ -560,20 +561,23 @@ def test_cannot_add_same_task_to_two_containers():

def test_cannot_add_two_autocancel_on_same_node():
with pytest.raises(RuntimeError):
suite = Defs().add_suite("s1")
defs = Defs()
suite = defs.add_suite("s1")
suite.add_autocancel(3)
suite.add_autocancel(4)


def test_cannot_add_autocancel_and_autoarchive_together():
with pytest.raises(RuntimeError):
suite = Defs().add_suite("s1")
defs = Defs()
suite = defs.add_suite("s1")
suite.add_autoarchive(3)
suite.add_autocancel(4)


def test_cannot_add_two_autorestore_on_same_node():
with pytest.raises(RuntimeError):
suite = Defs().add_suite("s1")
defs = Defs()
suite = defs.add_suite("s1")
suite.add_autorestore(["/s1"])
suite.add_autorestore(["/s1"])
14 changes: 7 additions & 7 deletions libs/pyext/test/py_u_TestNode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def suite_task():
family = suite.add_family("family")
family.add_repeat(ecf.RepeatDate("REPEAT", 20010101, 20010102, 1))
task = family.add_task("task")
return suite, family, task
return defs, suite, family, task


SUITE_GENERATED_VAR_NAMES = [
Expand Down Expand Up @@ -65,7 +65,7 @@ def suite_task():


def test_retrieve_suite_generated_variables_using_variable_list(suite_task):
suite, _, _ = suite_task
_, suite, _, _ = suite_task
vars = ecf.VariableList()
suite.get_generated_variables(vars)
names = {v.name() for v in vars}
Expand All @@ -75,7 +75,7 @@ def test_retrieve_suite_generated_variables_using_variable_list(suite_task):


def test_retrieve_suite_generated_variables_using_python_list(suite_task):
suite, _, _ = suite_task
_, suite, _, _ = suite_task
vars = suite.get_generated_variables()
names = {v.name() for v in vars}

Expand All @@ -84,7 +84,7 @@ def test_retrieve_suite_generated_variables_using_python_list(suite_task):


def test_retrieve_family_generated_variables_using_variable_list(suite_task):
_, family, _ = suite_task
_, _, family, _ = suite_task
vars = ecf.VariableList()
family.get_generated_variables(vars)
names = {v.name() for v in vars}
Expand All @@ -94,7 +94,7 @@ def test_retrieve_family_generated_variables_using_variable_list(suite_task):


def test_retrieve_family_generated_variables_using_python_list(suite_task):
_, family, _ = suite_task
_, _, family, _ = suite_task
vars = family.get_generated_variables()
names = {v.name() for v in vars}

Expand All @@ -103,7 +103,7 @@ def test_retrieve_family_generated_variables_using_python_list(suite_task):


def test_retrieve_task_generated_variables_using_variable_list(suite_task):
_, _, task = suite_task
_, _, _, task = suite_task
vars = ecf.VariableList()
task.get_generated_variables(vars)
names = {v.name() for v in vars}
Expand All @@ -113,7 +113,7 @@ def test_retrieve_task_generated_variables_using_variable_list(suite_task):


def test_retrieve_task_generated_variables_using_python_list(suite_task):
_, _, task = suite_task
_, _, _, task = suite_task
vars = task.get_generated_variables()
names = {v.name() for v in vars}

Expand Down
4 changes: 2 additions & 2 deletions libs/pyext/test/py_u_TestParent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def populated_definition():

defs = Defs()
defs.add_suite(suite)
return suite, family, family2, task, t1
return defs, suite, family, family2, task, t1


def test_unattached_nodes_have_no_parent_or_defs():
Expand All @@ -60,7 +60,7 @@ def test_unattached_nodes_have_no_parent_or_defs():


def test_attached_node_paths(populated_definition):
suite, family, family2, task, t1 = populated_definition
_, suite, family, family2, task, t1 = populated_definition

assert t1.get_abs_node_path() == _abs_node_path(t1), (
"Expected " + t1.get_abs_node_path() + " but got " + _abs_node_path(t1)
Expand Down
Loading