dpdp-crypto: fix cryptodev segfault with dpdk 19.02

[vpp.git] / test / test_jvpp.py

diff --git a/test/test_jvpp.py b/test/test_jvpp.py
index 9cb787f..9a58ca4 100644 (file)
--- a/test/test_jvpp.py
+++ b/test/test_jvpp.py
@@ -2,19 +2,29 @@
 
 import os
 import subprocess
+import unittest
 
-from framework import VppTestCase
+from framework import VppTestCase, running_extended_tests
 
 # Api files path
-API_FILES_PATH = "vpp/vpp-api/java"
+API_FILES_PATH = "japi/java"
 
 # Registry jar file name prefix
 REGISTRY_JAR_PREFIX = "jvpp-registry"
 
 
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
 class TestJVpp(VppTestCase):
     """ JVPP Core Test Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestJVpp, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestJVpp, cls).tearDownClass()
+
     def invoke_for_jvpp_core(self, api_jar_name, test_class_name):
         self.jvpp_connection_test(api_jar_name=api_jar_name,
                                   test_class_name=test_class_name,
@@ -97,7 +107,7 @@ class TestJVpp(VppTestCase):
                             "{0}-{1}.jar".format(jar_name, version))
 
     def jvpp_connection_test(self, api_jar_name, test_class_name, timeout):
-        install_dir = os.getenv('VPP_TEST_BUILD_DIR')
+        install_dir = os.getenv('VPP_BUILD_DIR')
         self.logger.info("Install directory : {0}".format(install_dir))
 
         version_reply = self.vapi.show_version()
@@ -133,7 +143,7 @@ class TestJVpp(VppTestCase):
         self.logger.info("Process output : {0}{1}".format(os.linesep, out))
 
         if self.process.returncode != 0:
-            raise Exception(
+            raise subprocess.CalledProcessError(
                 "Command {0} failed with return code: {1}.{2}"
                 "Process error output: {2}{3}"
                 .format(command, self.process.returncode, os.linesep, err))