- small tweaks;

Author: jaltmayerpizzorno

src/pytest_cleanslate/reduce.py

@@ -253,7 +253,8 @@ def fails(module_set: T.List[str]):
         return _bisect_items(modules, failing_module, fails, bar=bar)
 
 
-def reduce(*, tests_path: Path, results: Results = None, pytest_args: T.List[str] = (), trace: bool = False, **args) -> dict:
+def reduce(*, tests_path: Path, results: Results = None, pytest_args: T.List[str] = (),
+           trace: bool = False, **args) -> dict:
     if not results:
         print("Running tests...", flush=True)
         results = run_pytest(tests_path, (*pytest_args, '-x'), trace=trace)
@@ -292,9 +293,12 @@ def reduce(*, tests_path: Path, results: Results = None, pytest_args: T.List[str
     modules = _reduce_modules(tests_path, tests, failed_id, results.get_modules(), failed_module,
                               trace=trace, pytest_args=pytest_args)
 
-    if trace: print()
-    tests = _reduce_tests(tests_path, tests, failed_id, [*modules, failed_module],
-                          trace=trace, pytest_args=pytest_args)
+    if not failed_is_module:
+        if trace: print()
+        tests = _reduce_tests(tests_path, tests, failed_id, [*modules, failed_module],
+                              trace=trace, pytest_args=pytest_args)
+
+        # TODO if tests != [], see if it's enough to disable just them
 
     if trace: print()
     print("Reduced failure set:")

tests/test_reduce.py

@@ -18,11 +18,13 @@ def test_get_module():
     assert 'test.py' == get_module('test.py::test_foo')
     assert 'test.py' == get_module('test.py::test_foo[1]')
 
+
 def test_get_function():
     assert None == get_function('test.py')
     assert 'test_foo' == get_function('test.py::test_foo')
     assert 'test_foo' == get_function('test.py::test_foo[1]')
 
+
 def test_run_pytest_collect_failure(tests_dir):
     test1 = seq2p(tests_dir, 1)
     test1.write_text(dedent("""\
@@ -148,15 +150,37 @@ def test_reduce_test_fails_by_itself(tests_dir, r):
 @pytest.mark.parametrize("pollute_in_collect, fail_collect", [[False, False], [True, False], [True, True]])
 @pytest.mark.parametrize("r", [reduce.reduce, cli_reduce])
 def test_reduce(tests_dir, pollute_in_collect, fail_collect, r):
-    failing, polluter, tests = make_polluted_suite(tests_dir, fail_collect=fail_collect, pollute_in_collect=pollute_in_collect)
+    failing, polluter, tests = make_polluted_suite(tests_dir, fail_collect=fail_collect,
+                                                   pollute_in_collect=pollute_in_collect)
 
     reduction_file = tests_dir.parent / "reduction.json"
 
     reduction = r(tests_path=tests_dir, trace=True)
 
     assert reduction['failed'] == failing
     assert reduction['modules'] == [get_module(polluter)]
-    assert reduction['tests'] == [] if pollute_in_collect else [polluter]
+# this would be more precise... is it the test or the module?
+#    assert reduction['modules'] == ([get_module(polluter)] if pollute_in_collect else [])
+    assert reduction['tests'] == ([] if pollute_in_collect else [polluter])
+
+
+@pytest.mark.parametrize("pollute_in_collect, fail_collect", [[False, False], [True, False], [True, True]])
+@pytest.mark.parametrize("r", [reduce.reduce, cli_reduce])
+def test_reduce_pytest_args(tests_dir, pollute_in_collect, fail_collect, r):
+    failing, polluter, tests = make_polluted_suite(tests_dir, fail_collect=fail_collect,
+                               pollute_in_collect=pollute_in_collect)
+
+    (tests_dir / "conftest.py").write_text(dedent("""\
+        if read, this breaks everything
+        """))
+
+    reduction = r(tests_path=tests_dir, trace=True, pytest_args=['--noconftest'])
+
+    assert reduction['failed'] == failing
+    assert reduction['modules'] == [get_module(polluter)]
+# this would be more precise... is it the test or the module?
+#    assert reduction['modules'] == ([get_module(polluter)] if pollute_in_collect else [])
+    assert reduction['tests'] == ([] if pollute_in_collect else [polluter])
 
 
 @pytest.mark.parametrize("r", [reduce.reduce, cli_reduce])
@@ -191,22 +215,6 @@ def test_nothing():
     assert reduction['tests'] == []
 
 
-@pytest.mark.parametrize("pollute_in_collect, fail_collect", [[False, False], [True, False], [True, True]])
-@pytest.mark.parametrize("r", [reduce.reduce, cli_reduce])
-def test_reduce_pytest_args(tests_dir, pollute_in_collect, fail_collect, r):
-    failing, polluter, tests = make_polluted_suite(tests_dir, fail_collect=fail_collect, pollute_in_collect=pollute_in_collect)
-
-    (tests_dir / "conftest.py").write_text(dedent("""\
-        if read, this breaks everything
-        """))
-
-    reduction = r(tests_path=tests_dir, trace=True, pytest_args=['--noconftest'])
-
-    assert reduction['failed'] == failing
-    assert reduction['modules'] == [get_module(polluter)]
-    assert reduction['tests'] == [] if pollute_in_collect else [polluter]
-
-
 @pytest.mark.parametrize("r", [reduce.reduce, cli_reduce])
 def test_reduce_polluter_test_in_single_module(tests_dir, r):
     test = seq2p(tests_dir, 0)