Shorten the flag name

SidharthBansal · SidharthBansal · commit bb028ca10c99 · 2020-08-23T19:13:35.000+05:30
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -17,7 +17,7 @@ def pytest_configure(config):
         ("markers", "baseline_images: Compare output against references."),
         ("markers", "pytz: Tests that require pytz to be installed."),
         ("markers", "network: Tests that reach out to the network."),
-        ("markers", "matplotlib_baseline_image_generation: Flag to generate matplotlib baseline images."),
+        ("markers", "generate_images: Flag to generate matplotlib baseline images."),
         ("filterwarnings", "error"),
     ]:
         config.addinivalue_line(key, value)
@@ -141,7 +141,7 @@ def pd():
 def pytest_addoption(parser):
     try:
         parser.addoption(
-            "--matplotlib_baseline_image_generation",
+            "--generate_images",
              action="store_true",
              default=False,
              help="run matplotlib baseline image generation tests"
@@ -151,8 +151,8 @@ def pytest_addoption(parser):
 
 
 def pytest_collection_modifyitems(config, items):
-    if config.getoption("--matplotlib_baseline_image_generation"):
+    if config.getoption("--generate_images"):
         skip_non_matplotlib_baseline_image_generation_tests = pytest.mark.skip(reason="No need to run non image generation tests")
         for item in items:
-           if "matplotlib_baseline_image_generation" not in item.keywords:
+           if "generate_images" not in item.keywords:
                item.add_marker(skip_non_matplotlib_baseline_image_generation_tests)
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -274,14 +274,14 @@ def decorator(func):
         @pytest.mark.style(style)
         @_checked_on_freetype_version(freetype_version)
         @functools.wraps(func)
-        @pytest.mark.matplotlib_baseline_image_generation
+        @pytest.mark.generate_images
         def wrapper(*args, extension, request, **kwargs):
             __tracebackhide__ = True
             if 'extension' in old_sig.parameters:
                 kwargs['extension'] = extension
             if 'request' in old_sig.parameters:
                 kwargs['request'] = request
-            matplotlib_baseline_image_generation = request.config.getoption("--matplotlib_baseline_image_generation")
+            generate_images = request.config.getoption("--generate_images")
 
             img = _ImageComparisonBase(func, tol=tol, remove_text=remove_text,
                                        savefig_kwargs=savefig_kwargs)
@@ -307,7 +307,7 @@ def wrapper(*args, extension, request, **kwargs):
                 "Test generated {} images but there are {} baseline images"
                 .format(len(plt.get_fignums()), len(our_baseline_images)))
             for idx, baseline in enumerate(our_baseline_images):
-                img.compare(idx, baseline, extension, _lock=needs_lock, generating=matplotlib_baseline_image_generation)
+                img.compare(idx, baseline, extension, _lock=needs_lock, generating=generate_images)
 
         parameters = list(old_sig.parameters.values())
         if 'extension' not in old_sig.parameters:
diff --git a/pytest.ini b/pytest.ini
@@ -8,5 +8,5 @@ junit_family = xunit2
 
 
 markers =
-    matplotlib_baseline_image_generation: marks tests as matplotlib_baseline_image_generation (deselect with '-m "not matplotlib_baseline_image_generation"')
+    generate_images: marks tests as generate_images (deselect with '-m "not generate_images"')
     serial
