BaseTestCase shims assertIn

2 files changed, 14 insertions, 2 deletions

diff --git a/tests/base.py b/tests/base.py
new file mode 100644
index 0000000..1d5a370
--- /dev/null
+++ b/tests/base.py
@@ -0,0 +1,11 @@
+import sys
+import unittest
+
+import six
+
+
+class BaseTestCase(unittest.TestCase):
+    def assertIn(self, object, collection):
+        if six.PY2 and sys.version_info[1] <= 6:
+            return self.assertTrue(object in collection)
+        return super(BaseTestCase, self).assertIn(object, collection)
diff --git a/tests/test.py b/tests/test.py
index 04b5a11..59bf4cc 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -35,6 +35,7 @@ import docker
 import requests
 import six
 
+import base
 import fake_api
 
 try:
@@ -102,7 +103,7 @@ class Cleanup(object):
 
 @mock.patch.multiple('docker.Client', get=fake_request, post=fake_request,
                      put=fake_request, delete=fake_request)
-class DockerClientTest(Cleanup, unittest.TestCase):
+class DockerClientTest(Cleanup, base.BaseTestCase):
     def setUp(self):
         self.client = docker.Client()
         # Force-clear authconfig to avoid tampering with the tests
@@ -2295,7 +2296,7 @@ class DockerClientTest(Cleanup, unittest.TestCase):
         )
 
 
-class StreamTest(Cleanup, unittest.TestCase):
+class StreamTest(Cleanup, base.BaseTestCase):
 
     def setUp(self):
         socket_dir = tempfile.mkdtemp()