Skip to content

Commit

Permalink
fix(SC-686): Reverted some changes in test_attrsmodel.py and added …
Browse files Browse the repository at this point in the history
…`Group` to the `comment` section in `parametermodel.py`
  • Loading branch information
abnepc committed Nov 9, 2023
1 parent e0a39b0 commit 2504cff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions epyqlib/pm/parametermodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -1757,6 +1757,7 @@ def merge(name, *types):
merge(
"comment",
Parameter,
Group,
ArrayParameterElement,
TableArrayElement,
)
Expand Down
10 changes: 3 additions & 7 deletions epyqlib/tests/test_attrsmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ def merge(name, *types):
),
((Parameter, "value"),),
merge("uuid", *types.types.values()),
((Group, "comment"),),
)


Expand All @@ -129,25 +128,22 @@ def make_a_model(
)

group_a = group_cls(
name="Group A",
uuid="f5b7569e-9d7e-4433-a034-29c3e04d1ad4",
name="Group A", uuid="f5b7569e-9d7e-4433-a034-29c3e04d1ad4", comment=""
)
parameter_a_a = parameter_cls(
name="Parameter A A",
uuid="df286eb3-67f0-42d6-b56a-8ee1ded49248",
)
group_a_b = group_cls(
name="Group A B",
uuid="aee15e15-c5df-4e73-ae1a-9a5d4eaa798a",
name="Group A B", uuid="aee15e15-c5df-4e73-ae1a-9a5d4eaa798a", comment=""
)
parameter_b = parameter_cls(
name="Parameter B",
value=42,
uuid="a1fd7abb-4760-472e-bc94-1ef4d2cfad62",
)
group_c = group_cls(
name="Group C",
uuid="2777e016-a3e6-470d-b20c-7a44904df710",
name="Group C", uuid="2777e016-a3e6-470d-b20c-7a44904df710", comment=""
)
parameter_d = parameter_cls(
name="Parameter D",
Expand Down

0 comments on commit 2504cff

Please sign in to comment.