tests/krb5: Match filter after transforming test name

If you just want to rerun a single test that failed, this removes the
need to successfully guess its untransformed name.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/krb5/claims_tests.py b/python/samba/tests/krb5/claims_tests.py
index 8df4595079d3b4cfbc2493638ba1489ee5f06deb..348ea99ec0dd716b87fe898f46cd5cc12b130596 100755 (executable)
--- a/python/samba/tests/krb5/claims_tests.py
+++ b/python/samba/tests/krb5/claims_tests.py
@@ -721,9 +721,9 @@ class ClaimsTests(KDCBaseTest):
         FILTER = env_get_var_value('FILTER', allow_missing=True)
         for case in cls.cases:
             name = case.pop('name')
+            name = re.sub(r'\W+', '_', name)
             if FILTER and not re.search(FILTER, name):
                 continue
-            name = re.sub(r'\W+', '_', name)
 
             # Run tests making requests both to the krbtgt and to our own
             # account.
@@ -734,9 +734,9 @@ class ClaimsTests(KDCBaseTest):
 
         for case in cls.device_claims_cases:
             name = case.pop('test')
+            name = re.sub(r'\W+', '_', name)
             if FILTER and not re.search(FILTER, name):
                 continue
-            name = re.sub(r'\W+', '_', name)
 
             cls.generate_dynamic_test('test_device_claims', name,
                                       dict(case))

diff --git a/python/samba/tests/krb5/device_tests.py b/python/samba/tests/krb5/device_tests.py
index a1997ecb966b7e5c2627aceeff5f1444d17b0f01..87b65735a03bff2ee5a6c0beb611109cd1e7d824 100755 (executable)
--- a/python/samba/tests/krb5/device_tests.py
+++ b/python/samba/tests/krb5/device_tests.py
@@ -1795,9 +1795,9 @@ class DeviceTests(KDCBaseTest):
                 # be skipped.
                 continue
             name = case.pop('test')
+            name = re.sub(r'\W+', '_', name)
             if FILTER and not re.search(FILTER, name):
                 continue
-            name = re.sub(r'\W+', '_', name)
 
             cls.generate_dynamic_test('test_device_info', name,
                                       dict(case))

diff --git a/python/samba/tests/krb5/group_tests.py b/python/samba/tests/krb5/group_tests.py
index 4d43ec4217f30876d2ab85a9f23ff1308ee2c022..1214fa2bd8898a62dcc1a52a7faa67668f88ff2c 100755 (executable)
--- a/python/samba/tests/krb5/group_tests.py
+++ b/python/samba/tests/krb5/group_tests.py
@@ -76,9 +76,9 @@ class GroupTests(KDCBaseTest):
                 # be skipped.
                 continue
             name = case.pop('test')
+            name = re.sub(r'\W+', '_', name)
             if FILTER and not re.search(FILTER, name):
                 continue
-            name = re.sub(r'\W+', '_', name)
 
             cls.generate_dynamic_test('test_group', name,
                                       dict(case))