VPP-1506: dump local punts and registered punt sockets
[vpp.git] / test / test_jvpp.py
index 36dbdb2..595f03a 100644 (file)
@@ -99,7 +99,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()
@@ -135,7 +135,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))