make test: Force VCL test timeouts to FAIL test. 64/11064/2
authorDave Wallace <dwallacelf@gmail.com>
Fri, 9 Mar 2018 17:04:10 +0000 (12:04 -0500)
committerKeith Burns <alagalah@gmail.com>
Fri, 9 Mar 2018 18:12:32 +0000 (18:12 +0000)
Change-Id: Ie8d3bcb9021d9272bd27dba35d30e5081023f061
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
test/test_vcl.py

index d5bbccd..2cfb0ff 100644 (file)
@@ -58,7 +58,10 @@ class VclTestCase(VppTestCase):
                                      self.logger, self.env)
         worker_client.start()
         worker_client.join(self.timeout)
-        self.validateResults(worker_client, worker_server, self.timeout)
+        try:
+            self.validateResults(worker_client, worker_server, self.timeout)
+        except Exception, error:
+            self.fail("Failed with %s" % error)
 
     def thru_host_stack_setup(self):
         self.vapi.session_enable_disable(is_enabled=1)
@@ -122,7 +125,10 @@ class VclTestCase(VppTestCase):
         worker_client.start()
         worker_client.join(self.timeout)
 
-        self.validateResults(worker_client, worker_server, self.timeout)
+        try:
+            self.validateResults(worker_client, worker_server, self.timeout)
+        except Exception, error:
+            self.fail("Failed with %s" % error)
 
     def validateResults(self, worker_client, worker_server, timeout):
         if os.path.isdir('/proc/{}'.format(worker_server.process.pid)):