Skip to content

Commit 4232ca6

Browse files
committed
Fix: Remove duplicate test functions after rebase conflict
During rebase conflict resolution, test_process_line_package_in_override_keys and test_process_line_package_in_ignore_keys were accidentally duplicated. Removed duplicates, keeping only one copy of each test.
1 parent d20cd8f commit 4232ca6

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

tests/test_processing.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -63,36 +63,6 @@ def test_process_line_package_in_ignore_keys():
6363
assert constraints == []
6464

6565

66-
def test_process_line_package_in_override_keys():
67-
"""Test process_line comments out packages in override_keys."""
68-
from mxdev.processing import process_line
69-
70-
requirements, constraints = process_line(
71-
"my.package==1.0.0",
72-
package_keys=[],
73-
override_keys=["my.package"],
74-
ignore_keys=[],
75-
variety="r",
76-
)
77-
assert requirements == ["# my.package==1.0.0 -> mxdev disabled (version override)\n"]
78-
assert constraints == []
79-
80-
81-
def test_process_line_package_in_ignore_keys():
82-
"""Test process_line comments out packages in ignore_keys."""
83-
from mxdev.processing import process_line
84-
85-
requirements, constraints = process_line(
86-
"my.package==1.0.0",
87-
package_keys=[],
88-
override_keys=[],
89-
ignore_keys=["my.package"],
90-
variety="r",
91-
)
92-
assert requirements == ["# my.package==1.0.0 -> mxdev disabled (ignore)\n"]
93-
assert constraints == []
94-
95-
9666
def test_process_line_constraint():
9767
"""Test process_line with constraint variety."""
9868
from mxdev.processing import process_line

0 commit comments

Comments
 (0)