Merge a373712 into 96409be

CleanCut · Nov 2, 2020 · c1d8128 · c1d8128
2 parents 96409be + a373712
commit c1d8128
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/green/config.py b/green/config.py
@@ -49,7 +49,7 @@
     config=None,  # Not in configs
     file_pattern="test*.py",
     test_pattern="*",
-    junit_report=False,
+    junit_report="",
     run_coverage=False,
     cov_config_file=True,  # A string with a special boolean default
     quiet_coverage=False,
@@ -684,7 +684,6 @@ def mergeConfig(args, testing=False):  # pragma: no cover
             "no_tracebacks",
             "disable_windows",
             "quiet_coverage",
-            "junit_report",
         ]:
             config_getter = config.getboolean
         elif name in ["processes", "debug", "verbose", "minimum_coverage"]:
@@ -698,6 +697,7 @@ def mergeConfig(args, testing=False):  # pragma: no cover
             "omit_patterns",
             "warnings",
             "test_pattern",
+            "junit_report",
         ]:
             config_getter = config.get
         elif name in ["targets", "help", "config"]: