X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_vom.py;h=2d735ee01480381ad3ee261ad07c627e1dfce54f;hb=refs%2Fchanges%2F36%2F23336%2F6;hp=bfd7007fbec98fd274da23331220d65c8d09fdda;hpb=812ed39f9da336310e815c361ab5a9f118657d94;p=vpp.git

diff --git a/test/test_vom.py b/test/test_vom.py
index bfd7007fbec..2d735ee0148 100644
--- a/test/test_vom.py
+++ b/test/test_vom.py
@@ -1,27 +1,32 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ VAPI test """
 
 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 """
 
+    @classmethod
+    def setUpClass(cls):
+        super(VOMTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VOMTestCase, cls).tearDownClass()
+
     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()