add negative tests and check return_code in the tests

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>

Author: arlakshm

scripts/intfutil

@@ -14,15 +14,15 @@ from utilities_common.intf_filter import parse_interface_in_filter
 
 # mock the redis for unit test purposes #
 try:
-    if os.environ["UTILITIES_UNIT_TESTING"] >= "2":
+    if os.environ["UTILITIES_UNIT_TESTING"] == "2":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
         tests_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, tests_path)
         import mock_tables.dbconnector
-        if os.environ["UTILITIES_UNIT_TESTING"] == "3":
-            import mock_tables.mock_multi_asic
-            mock_tables.dbconnector.load_namespace_config()
+    if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic":
+        import mock_tables.mock_multi_asic
+        mock_tables.dbconnector.load_namespace_config()
 
 except KeyError:
     pass

tests/multi_asic_intfutil_test.py

@@ -79,66 +79,102 @@
 Ethernet-BP0      up       up  Ethernet-BP0          ASIC1:Eth0-ASIC1
 Ethernet-BP4      up       up  Ethernet-BP4          ASIC1:Eth1-ASIC1
 """
+
+intf_invalid_asic_error="""ValueError: Unknown Namespace asic99"""
+
 class TestInterfacesMultiAsic(object):
     @classmethod
     def setup_class(cls):
         print("SETUP")
         os.environ["PATH"] += os.pathsep + scripts_path
-        os.environ["UTILITIES_UNIT_TESTING"] = "3"
+        os.environ["UTILITIES_UNIT_TESTING"] = "2"
+        os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] = "multi_asic"
 
     def setUp(self):
         self.runner = CliRunner()
 
+    def get_result_and_return_code(self, cmd):
+        return_code = 0
+        try:
+            output = subprocess.check_output(
+            cmd, stderr=subprocess.STDOUT, shell=True)
+        except subprocess.CalledProcessError as e: 
+            return_code = e.returncode
+            #store only the error, no need for the traceback
+            output = e.output.strip().split("\n")[-1]
+
+        return(return_code, output)
 
     def test_multi_asic_interface_status_all(self):
-        result = subprocess.check_output(
-            'intfutil -c status -d all', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code( 'intfutil -c status -d all')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_status_all
 
     def test_multi_asic_interface_status(self):
-        result = subprocess.check_output(
-            'intfutil -c status', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code('intfutil -c status')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_status
 
     def test_multi_asic_interface_status_asic0_all(self):
-        result = subprocess.check_output(
-            'intfutil -c status -n asic0 -d all', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code('intfutil -c status -n asic0 -d all')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_status_asic0_all
 
     def test_multi_asic_interface_status_asic0(self):
-        result = subprocess.check_output(
-            'intfutil -c status', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code('intfutil -c status -n asic0')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_status_asic0
 
     def test_multi_asic_interface_desc(self):
-        result = subprocess.check_output(
-            'intfutil -c description', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code('intfutil -c description')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_description
 
     def test_multi_asic_interface_desc_all(self):
-        result = subprocess.check_output(
-            'intfutil -c description -d all', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code( 'intfutil -c description -d all')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_description_all
 
     def test_multi_asic_interface_asic0(self):
-        result = subprocess.check_output(
-            'intfutil -c description -n asic0', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code( 'intfutil -c description -n asic0')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_description_asic0
 
     def test_multi_asic_interface_desc_asic0_all(self):
-        result = subprocess.check_output(
-            'intfutil -c description -n asic0 -d all', stderr=subprocess.STDOUT, shell=True)
-        print(result)
+        return_code, result = self.get_result_and_return_code('intfutil -c description -n asic0 -d all')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 0
         assert result == intf_description_asic0_all
 
-        
+    def test_invalid_asic_name(self):
+        return_code, result = self.get_result_and_return_code('intfutil -c description -n asic99 -d all')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 1
+        assert result == intf_invalid_asic_error
+
+    def test_invalid_asic_name(self):
+        return_code, result = self.get_result_and_return_code('intfutil -c status -n asic99')
+        print("return_code: {}".format(return_code))
+        print("result = {}".format(result))  
+        assert return_code == 1
+        assert result == intf_invalid_asic_error
+
     def teardown_class(cls):
         print("TEARDOWN")
         os.environ["PATH"] = os.pathsep.join(