Added support for VASL 6.5.1.

vasl_templates/webapp/tests/test_counters.py

@@ -91,17 +91,18 @@ def test_counter_images( webapp ):
                 gpids.add( mo.group() )
         return gpids
     legacy_gpids = get_gpids( "vasl-pieces-legacy.txt" )
-    latest_gpids = get_gpids( "vasl-pieces-6.5.0.txt" )
+    latest_gpids = get_gpids( "vasl-pieces-6.5.1.txt" )
     common_gpids = legacy_gpids.intersection( latest_gpids )
     expected_missing_gpids = expected_missing_gpids.difference( common_gpids )
     expected_missing_gpids.remove( "1002" ) # FUDGE! this is a remapped GPID (11340)
+    expected_missing_gpids.remove( "1527" ) # FUDGE! this is a remapped GPID (12730)
 
     def _do_check_front( gpid, code, data ):
-        if vasl_version != SUPPORTED_VASL_MOD_VERSIONS[-1] and gpid in expected_missing_gpids:
+        if vasl_version not in ("6.5.0","6.5.1") and gpid in expected_missing_gpids:
             return code == 404 and not data
         return code == 200 and data
     def _do_check_back( gpid, code, data ):
-        if vasl_version != SUPPORTED_VASL_MOD_VERSIONS[-1] and gpid in expected_missing_gpids:
+        if vasl_version not in ("6.5.0","6.5.1") and gpid in expected_missing_gpids:
             return code == 404 and not data
         return (code == 200 and data) or (code == 404 and not data)
 
@@ -253,12 +254,14 @@ def test_gpid_remapping( webapp, webdriver ):
     # run the tests using VASL 6.4.4 and 6.5.0
     do_test( find_vasl_mod("6.4.4"), True )
     do_test( find_vasl_mod("6.5.0"), True )
+    do_test( find_vasl_mod("6.5.1"), True )
 
     # disable GPID remapping and try again
     prev_gpid_mappings = control_tests.set_gpid_remappings( gpids=[] )
     try:
         do_test( find_vasl_mod("6.4.4"), True )
         do_test( find_vasl_mod("6.5.0"), False )
+        do_test( find_vasl_mod("6.5.1"), False )
     finally:
         # NOTE: This won't get done if Python exits unexpectedly in the try block,
         # which will leave the server in the wrong state if it's remote.

vasl_templates/webapp/vasl_mod.py

@@ -14,8 +14,8 @@ from vasl_templates.webapp import app, globvars
 from vasl_templates.webapp.config.constants import DATA_DIR
 from vasl_templates.webapp.vo import get_vo_listings
 
-SUPPORTED_VASL_MOD_VERSIONS = [ "6.4.0", "6.4.1", "6.4.2", "6.4.3", "6.4.4", "6.5.0" ]
-SUPPORTED_VASL_MOD_VERSIONS_DISPLAY = "6.4.0-6.5.0"
+SUPPORTED_VASL_MOD_VERSIONS = [ "6.4.0", "6.4.1", "6.4.2", "6.4.3", "6.4.4", "6.5.0", "6.5.1" ]
+SUPPORTED_VASL_MOD_VERSIONS_DISPLAY = "6.4.0-6.5.1"
 
 warnings = [] # nb: for the test suite
 
@@ -484,6 +484,9 @@ GPID_REMAPPINGS = [
         # He also suggests that 7124 and 7128 are incorrectly-added duplicates, and the correct ones
         # are 2542 and 2544.
         "7124": "11479", # FT-17 730m(f) (German)
+    } ],
+    [ "6.5.1", {
+        "1527": "12730" # IP Carrier AOV (British)
     } ]
 ]