diff options
| author | Joffrey F <joffrey@docker.com> | 2018-01-30 18:22:41 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-01-30 18:42:38 -0800 |
| commit | ccbde11c8dbb8773aed84abac92c6361b8e11229 (patch) | |
| tree | 8bf4e02458dded8990a80a8e6bdcb3a1cdea3532 /tests/integration | |
| parent | 75e2e8ad816ac35e1c4928f6b3f9e40841ca493c (diff) | |
| download | docker-py-improve_authconfig_genconfig_separation.tar.gz | |
Improve separation between auth_configs and general_configsimprove_authconfig_genconfig_separation
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/api_container_test.py | 2 | ||||
| -rw-r--r-- | tests/integration/base.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index f48e78e..e5d7943 100644 --- a/tests/integration/api_container_test.py +++ b/tests/integration/api_container_test.py @@ -161,7 +161,7 @@ class CreateContainerTest(BaseAPIIntegrationTest): self.client.start(container3_id) info = self.client.inspect_container(res2['Id']) - self.assertCountEqual(info['HostConfig']['VolumesFrom'], vol_names) + assert len(info['HostConfig']['VolumesFrom']) == len(vol_names) def create_container_readonly_fs(self): ctnr = self.client.create_container( diff --git a/tests/integration/base.py b/tests/integration/base.py index 4f92901..04d9afd 100644 --- a/tests/integration/base.py +++ b/tests/integration/base.py @@ -4,7 +4,6 @@ import unittest import docker from docker.utils import kwargs_from_env -import six from .. import helpers @@ -19,9 +18,6 @@ class BaseIntegrationTest(unittest.TestCase): """ def setUp(self): - if six.PY2: - self.assertRegex = self.assertRegexpMatches - self.assertCountEqual = self.assertItemsEqual self.tmp_imgs = [] self.tmp_containers = [] self.tmp_folders = [] |