From bb075ef0dabf71cf61886ae85d5a73e20643ade2 Mon Sep 17 00:00:00 2001 From: Pacman Ghost Date: Mon, 9 Oct 2023 17:13:06 +0700 Subject: [PATCH] Tidied up some test fixtures. --- .../fixtures/{vasl-pieces-6.5.0.txt => counters/6.5.0.txt} | 0 .../fixtures/{vasl-pieces-6.5.1.txt => counters/6.5.1.txt} | 0 .../fixtures/{vasl-pieces-6.6.0.txt => counters/6.6.0.txt} | 0 .../fixtures/{vasl-pieces-6.6.1.txt => counters/6.6.1.txt} | 0 .../fixtures/{vasl-pieces-6.6.2.txt => counters/6.6.2.txt} | 0 .../fixtures/{vasl-pieces-6.6.3.txt => counters/6.6.3.txt} | 0 .../fixtures/{vasl-pieces-6.6.4.txt => counters/6.6.4.txt} | 0 .../fixtures/{vasl-pieces-6.6.5.txt => counters/6.6.5.txt} | 0 .../fixtures/{vasl-pieces-6.6.6.txt => counters/6.6.6.txt} | 0 vasl_templates/webapp/tests/test_counters.py | 4 ++-- 10 files changed, 2 insertions(+), 2 deletions(-) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.5.0.txt => counters/6.5.0.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.5.1.txt => counters/6.5.1.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.0.txt => counters/6.6.0.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.1.txt => counters/6.6.1.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.2.txt => counters/6.6.2.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.3.txt => counters/6.6.3.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.4.txt => counters/6.6.4.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.5.txt => counters/6.6.5.txt} (100%) rename vasl_templates/webapp/tests/fixtures/{vasl-pieces-6.6.6.txt => counters/6.6.6.txt} (100%) diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.0.txt b/vasl_templates/webapp/tests/fixtures/counters/6.5.0.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.0.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.5.0.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.1.txt b/vasl_templates/webapp/tests/fixtures/counters/6.5.1.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.1.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.5.1.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.0.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.0.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.0.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.0.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.1.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.1.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.1.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.1.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.2.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.2.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.2.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.2.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.3.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.3.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.3.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.3.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.4.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.4.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.4.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.4.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.5.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.5.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.5.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.5.txt diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.6.txt b/vasl_templates/webapp/tests/fixtures/counters/6.6.6.txt similarity index 100% rename from vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.6.txt rename to vasl_templates/webapp/tests/fixtures/counters/6.6.6.txt diff --git a/vasl_templates/webapp/tests/test_counters.py b/vasl_templates/webapp/tests/test_counters.py index 5e3272a..d70b76f 100644 --- a/vasl_templates/webapp/tests/test_counters.py +++ b/vasl_templates/webapp/tests/test_counters.py @@ -63,7 +63,7 @@ def test_counter_images( webapp, webdriver ): #pylint: disable=too-many-locals return (code == 200 and data) or (code == 404 and not data) # initialize - check_dir = os.path.join( os.path.split(__file__)[0], "fixtures" ) + check_dir = os.path.join( os.path.split(__file__)[0], "fixtures/counters" ) save_dir = os.environ.get( "COUNTERS_SAVEDIR" ) # nb: define this to save the generated reports if save_dir: if os.path.isdir( save_dir ): @@ -87,7 +87,7 @@ def test_counter_images( webapp, webdriver ): #pylint: disable=too-many-locals init_webapp( webapp, webdriver ) # figure out what we're expecting to see - fname = os.path.join( check_dir, "vasl-pieces-{}.txt".format( + fname = os.path.join( check_dir, "{}.txt".format( aliases.get( vasl_version, vasl_version ) ) ) with open( fname, "r", encoding="utf-8" ) as fp: