Tests: Cleanup @skip decorator.
[vpp.git] / test / test_vom.py
index bfd7007..222d72c 100644 (file)
@@ -4,24 +4,21 @@
 import unittest
 import os
 import signal
-import subprocess
-from threading import Thread
-from log import single_line_delim
 from framework import VppTestCase, running_extended_tests, \
-    running_on_centos, VppTestRunner, Worker
+    VppTestRunner, Worker
 
 
-@unittest.skipUnless(running_extended_tests(), "part of extended tests")
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
 class VOMTestCase(VppTestCase):
     """ VPP Object Model Test """
 
     def test_vom_cpp(self):
         """ run C++ VOM tests """
-        var = "BR"
+        var = "TEST_DIR"
         built_root = os.getenv(var, None)
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vom_test/vom_test" % built_root
+        executable = "%s/build/vom_test/vom_test" % built_root
         worker = Worker(
             [executable, "vpp object model", self.shm_prefix], self.logger)
         worker.start()