Add more error message for test

sonic-net · Apr 4, 2017 · a3ae2ba · a3ae2ba
1 parent d4aa596
commit a3ae2ba
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/sonic-config-engine/tests/test_acl.py b/src/sonic-config-engine/tests/test_acl.py
@@ -4,7 +4,7 @@
 
 from unittest import TestCase
 
-class TestJ2Files(TestCase):
+class TestAcl(TestCase):
     def setUp(self):
         self.test_dir = os.path.dirname(os.path.realpath(__file__))
         self.script_file = os.path.join(self.test_dir, '..', 'sonic-cfggen')
@@ -16,11 +16,23 @@ def setUp(self):
 
     def run_script(self, argument):
         print 'CMD: sonic-cfggen ' + argument
-        return subprocess.check_output(self.script_file + ' ' + argument, shell=True)
+        output = ''
+        try:
+            output = subprocess.check_output(self.script_file + ' ' + argument, shell=True, stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError, (p):
+            print 'subprocess.CalledProcessError: cmd:%s returncode:%s' % (p.cmd, p.returncode)
+            print output
+        return output
 
     def run_acl_script(self, argument):
         print 'CMD: translate_acl ' + argument
-        return subprocess.check_output(self.acl_script_file + ' ' + argument, shell=True)
+        output = ''
+        try:
+            output = subprocess.check_output(self.acl_script_file + ' ' + argument, shell=True, stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError, (p):
+            print 'subprocess.CalledProcessError: cmd:%s returncode:%s' % (p.cmd, p.returncode)
+            print output
+        return output
 
     def test_translate_acl(self):
         argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -o ' + self.test_dir + ' ' + self.t0_acl
@@ -30,7 +42,7 @@ def test_translate_acl(self):
             output_file = os.path.join(self.test_dir, filename)
             assert filecmp.cmp(sample_output_file, output_file)
 
-    def test_translate_everflor(self):
+    def test_translate_everflow(self):
         argument = '-m ' + self.t0_minigraph_everflow + ' -p ' + self.t0_port_config + ' -o ' + self.test_dir + ' ' + self.t0_acl
         self.run_acl_script(argument)
         for filename in ['rules_for_everflow.json','table_everflow.json']: