Added a conf to ingore test (refs #20800).

global-conf.sh

@@ -115,6 +115,8 @@ HA_LB2_IP=
 TESTER_MS_INSTANCES=
 # TESTER_MAX_INSTANCES is ignored if TESTER_MS_INSTANCES is set
 TESTER_MAX_INSTANCES=
+# separate values with commas
+TESTER_IGNORED_TESTS=
 
 
 # Upstream configuration override

tester.py

@@ -122,6 +122,7 @@ class Tester():
         return criticality, description
 
     def discover_tests(self, basic_only=False):
+        ignored_tests = utils.get_conf('TESTER_IGNORED_TESTS', '').split(',')
         tests = list()
         # Get standard tests
         path = os.path.join(self.root_dir, 'tests')
@@ -134,6 +135,8 @@ class Tester():
             log('The tests dir is empty ("%s").' % path)
             return tests
         for name in names:
+            if name in ignored_tests:
+                continue
             test_path = os.path.join(path, name)
             if os.path.isfile(test_path):
                 criticality, description = self.parse_file_header(test_path)
@@ -191,6 +194,8 @@ class Tester():
                     ms_tests.append('test_wowza_secure.py')
                     ms_tests.append('ms_live_tester.py')
                 for name in ms_tests:
+                    if name in ignored_tests:
+                        continue
                     test_path = os.path.join(ms_path, name)
                     criticality, description = self.parse_file_header(test_path)
                     tests.append(('%s (%s)' % (name, user), criticality, description, [test_path, user]))

tests/test_backup.py

@@ -52,9 +52,6 @@ os.chdir(os.path.dirname(__file__))
 if os.path.isfile('../utils.py'):
     es_utils = imp.load_source('es_utils', '../utils.py')
     conf = es_utils.load_conf()
-    if conf.get('BURP_NO_TEST'):
-        print('BURP_NO_TEST is set in config, test skipped')
-        sys.exit(2)
     BURP_SERVER = conf.get('BURP_SERVER')
     BURP_CLIENT_NAME = conf.get('BURP_CLIENT_NAME') or 'localhost'
     if BURP_SERVER: