X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fremote_test.py;h=21913b6c959b38802d9043a8d4dc8d0023917143;hb=dd1e3e780;hp=f5b3c620cc4d51239341331db6828025e1bb7e33;hpb=e63325e3ca03c847963863446345e6c80a2c0cfd;p=vpp.git

diff --git a/test/remote_test.py b/test/remote_test.py
index f5b3c620cc4..21913b6c959 100644
--- a/test/remote_test.py
+++ b/test/remote_test.py
@@ -3,21 +3,14 @@
 import inspect
 import os
 import unittest
-from framework import VppTestCase
 from multiprocessing import Process, Pipe
 from pickle import dumps
+
 import six
 from six import moves
-import sys
-if sys.version_info <= (3, 4):
-    from aenum import IntEnum
-else:
-    from enum import IntEnum
 
-if sys.version_info <= (3, 6):
-    from aenum import IntFlag
-else:
-    from enum import IntFlag
+from framework import VppTestCase
+from enum import Enum
 
 
 class SerializableClassCopy(object):
@@ -273,7 +266,7 @@ class RemoteClass(Process):
             if type(obj) is tuple:
                 rv = tuple(rv)
             return rv
-        elif (isinstance(obj, IntEnum) or isinstance(obj, IntFlag)):
+        elif (isinstance(obj, Enum)):
             return obj.value
         else:
             return self._make_obj_serializable(obj)
@@ -360,7 +353,7 @@ class RemoteVppTestCase(VppTestCase):
 
         @classmethod
         def setUpClass(cls):
-            # fork new process before clinet connects to VPP
+            # fork new process before client connects to VPP
             cls.remote_test = RemoteClass(RemoteVppTestCase)
 
             # start remote process
@@ -408,6 +401,10 @@ class RemoteVppTestCase(VppTestCase):
         super(RemoteVppTestCase, cls).setUpClass()
         os.environ = orig_env
 
+    @classmethod
+    def tearDownClass(cls):
+        super(RemoteVppTestCase, cls).tearDownClass()
+
     @unittest.skip("Empty test")
     def emptyTest(self):
         """ Do nothing """