vlib: clean up r2 plugin registration relocator

[vpp.git] / test / sanity_run_vpp.py

diff --git a/test/sanity_run_vpp.py b/test/sanity_run_vpp.py
index 012b16d..4743102 100644 (file)
--- a/test/sanity_run_vpp.py
+++ b/test/sanity_run_vpp.py
@@ -1,17 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 from multiprocessing import Pipe
-from sys import exit
-from hook import VppDiedError
-from framework import VppTestCase, KeepAliveReporter
+import sys
+from asfframework import VppDiedError, VppAsfTestCase, KeepAliveReporter
 
 
-class SanityTestCase(VppTestCase):
-    """ Sanity test case - verify if VPP is able to start """
-    pass
+class SanityTestCase(VppAsfTestCase):
+    """Sanity test case - verify whether VPP is able to start"""
 
-if __name__ == '__main__':
+    cpus = [0]
+
+    # don't ask to debug SanityTestCase
+    @classmethod
+    def wait_for_enter(cls, pid=0):
+        pass
+
+    @classmethod
+    def _debug_quit(cls):
+        try:
+            cls.vpp.poll()
+        except AttributeError:
+            pass
+
+
+def main():
     rc = 0
     tc = SanityTestCase
     x, y = Pipe()
@@ -24,9 +37,17 @@ if __name__ == '__main__':
     else:
         try:
             tc.tearDownClass()
-        except:
-            pass
+        except Exception:
+            rc = -1
     x.close()
     y.close()
 
-    exit(rc)
+    if rc == 0:
+        print("Sanity test case passed.")
+    else:
+        print("Sanity test case failed.")
+    return rc
+
+
+if __name__ == "__main__":
+    sys.exit(main())