X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fdiscover_tests.py;h=0eaa149d0db2fd41cffbaa414756c813c18aa980;hb=73f23a806de8be8aa0cba60c3975ca3dcf92d3a5;hp=eea594107b67449eb43f36a69f81bc949fadaf80;hpb=e0d2bd6bd7fc59c0c6ac48195d7f825dc99bfd91;p=vpp.git

diff --git a/test/discover_tests.py b/test/discover_tests.py
index eea594107b6..0eaa149d0db 100755
--- a/test/discover_tests.py
+++ b/test/discover_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import os
@@ -22,15 +22,13 @@ def discover_tests(directory, callback):
         if not _f.startswith("test_") or not _f.endswith(".py"):
             continue
         name = "".join(f.split("/")[-1].split(".")[:-1])
-        if name in sys.modules:
-            raise Exception("Duplicate test module `%s' found!" % name)
         module = importlib.import_module(name)
         for name, cls in module.__dict__.items():
             if not isinstance(cls, type):
                 continue
             if not issubclass(cls, unittest.TestCase):
                 continue
-            if name == "VppTestCase":
+            if name == "VppTestCase" or name.startswith("Template"):
                 continue
             for method in dir(cls):
                 if not callable(getattr(cls, method)):
@@ -41,17 +39,3 @@ def discover_tests(directory, callback):
 
 def print_callback(file_name, cls, method):
     print("%s.%s.%s" % (file_name, cls.__name__, method))
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="Discover VPP unit tests")
-    parser.add_argument("-d", "--dir", action='append', type=str,
-                        help="directory containing test files "
-                             "(may be specified multiple times)")
-    args = parser.parse_args()
-    if args.dir is None:
-        args.dir = "."
-
-    suite = unittest.TestSuite()
-    for d in args.dir:
-        discover_tests(d, print_callback)