VPP-1508 python3 tests: use six.iteritems

[vpp.git] / test / test_jvpp.py

diff --git a/test/test_jvpp.py b/test/test_jvpp.py
index 9cb787f..6151ebd 100644 (file)
--- a/test/test_jvpp.py
+++ b/test/test_jvpp.py
@@ -2,16 +2,18 @@
 
 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 """
 
@@ -133,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))