summaryrefslogtreecommitdiffstats
path: root/test/remote_test.py
diff options
context:
space:
mode:
authorOle Trøan <otroan@employees.org>2019-03-15 16:14:41 +0000
committerOle Trøan <otroan@employees.org>2019-03-15 17:34:06 +0000
commit3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934 (patch)
tree4c7248e37fc7e0d3478fa5a77a8bfc7b2c9159d4 /test/remote_test.py
parent3fef8f811a013d1392f702fda1347c5211471ed7 (diff)
Revert "API: Cleanup APIs interface.api"
This reverts commit e63325e3ca03c847963863446345e6c80a2c0cfd. Allow time for CSIT to accommodate. Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2 Signed-off-by: ot@cisco.com
Diffstat (limited to 'test/remote_test.py')
-rw-r--r--test/remote_test.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/test/remote_test.py b/test/remote_test.py
index f5b3c620cc4..bc6d70764ec 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)