Rename 'sonic-utilities-tests' to 'tests'

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ If this is a bug fix, make sure your description includes "closes #xxxx",
 issue when the PR is merged.
 
 If you are adding/modifying/removing any command or utility script, please also
-make sure to add/modify/remove any unit tests from the sonic-utilities-tests
+make sure to add/modify/remove any unit tests from the tests
 directory as appropriate.
 
 If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'

scripts/dropconfig

@@ -21,7 +21,7 @@ from tabulate import tabulate
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        test_path = os.path.join(modules_path, "sonic-utilities-tests")
+        test_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, test_path)
         import mock_tables.dbconnector

scripts/dropstat

@@ -26,7 +26,7 @@ from natsort import natsorted
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        test_path = os.path.join(modules_path, "sonic-utilities-tests")
+        test_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, test_path)
         import mock_tables.dbconnector

scripts/gearboxutil

@@ -11,7 +11,7 @@ import os
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        tests_path = os.path.join(modules_path, "sonic-utilities-tests")
+        tests_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, tests_path)
         import mock_tables.dbconnector

scripts/intfstat

@@ -19,7 +19,7 @@ import time
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        test_path = os.path.join(modules_path, "sonic-utilities-tests")
+        test_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, test_path)
         import mock_tables.dbconnector

scripts/intfutil

@@ -16,7 +16,7 @@ import os
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        tests_path = os.path.join(modules_path, "sonic-utilities-tests")
+        tests_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, tests_path)
         import mock_tables.dbconnector

scripts/psushow

@@ -10,7 +10,7 @@ from tabulate import tabulate
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        test_path = os.path.join(modules_path, "sonic-utilities-tests")
+        test_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, test_path)
         import mock_tables.dbconnector

scripts/sfpshow

@@ -17,7 +17,7 @@ from tabulate import tabulate
 try:
     if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
-        test_path = os.path.join(modules_path, "sonic-utilities-tests")
+        test_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, test_path)
         import mock_tables.dbconnector

setup.py

@@ -50,14 +50,14 @@
         'show',
         'sonic_installer',
         'sonic_installer.bootloader',
-        'sonic-utilities-tests',
+        'tests',
         'undebug',
         'utilities_common',
         'watchdogutil',
     ],
     package_data={
         'show': ['aliases.ini'],
-        'sonic-utilities-tests': ['acl_input/*', 'mock_tables/*.py', 'mock_tables/*.json', 'filter_fdb_input/*']
+        'tests': ['acl_input/*', 'mock_tables/*.py', 'mock_tables/*.json', 'filter_fdb_input/*']
     },
     scripts=[
         'scripts/aclshow',

sonic-utilities-tests/filter_fdb_input/test_vectors.py → tests/filter_fdb_input/test_vectors.py

@@ -243,14 +243,14 @@
         ],
     },
     {
-        "arp": "sonic-utilities-tests/filter_fdb_input/arp.json",
-        "fdb": "sonic-utilities-tests/filter_fdb_input/fdb.json",
-        "config_db": "sonic-utilities-tests/filter_fdb_input/config_db.json",
-        "expected_fdb": "sonic-utilities-tests/filter_fdb_input/expected_fdb.json"
+        "arp": "tests/filter_fdb_input/arp.json",
+        "fdb": "tests/filter_fdb_input/fdb.json",
+        "config_db": "tests/filter_fdb_input/config_db.json",
+        "expected_fdb": "tests/filter_fdb_input/expected_fdb.json"
     },
     {
-        "arp": "sonic-utilities-tests/filter_fdb_input/arp.json",
-        "fdb": "sonic-utilities-tests/filter_fdb_input/fdb.json",
+        "arp": "tests/filter_fdb_input/arp.json",
+        "fdb": "tests/filter_fdb_input/fdb.json",
         "config_db": {
             "VLAN": {
                 "Vlan1": {}
@@ -263,8 +263,8 @@
         ],
     },
     {
-        "arp": "sonic-utilities-tests/filter_fdb_input/arp.json",
-        "fdb": "sonic-utilities-tests/filter_fdb_input/fdb.json",
+        "arp": "tests/filter_fdb_input/arp.json",
+        "fdb": "tests/filter_fdb_input/fdb.json",
         "config_db": {
         },
         "expected_fdb": [

sonic-utilities-tests/gearbox_test.py → tests/gearbox_test.py

@@ -9,7 +9,7 @@
 sys.path.insert(0, test_path)
 sys.path.insert(0, modules_path)
 
-import mock_tables.dbconnector # required by sonic-utilities-tests
+import mock_tables.dbconnector # required by tests
 
 import show.main as show