summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/models_images_test.py6
-rw-r--r--tests/integration/models_services_test.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/integration/models_images_test.py b/tests/integration/models_images_test.py
index 9313916..2fa71a7 100644
--- a/tests/integration/models_images_test.py
+++ b/tests/integration/models_images_test.py
@@ -74,6 +74,12 @@ class ImageCollectionTest(BaseIntegrationTest):
image = client.images.pull('alpine', tag='3.3')
assert 'alpine:3.3' in image.attrs['RepoTags']
+ def test_pull_multiple(self):
+ client = docker.from_env(version=TEST_API_VERSION)
+ images = client.images.pull('hello-world')
+ assert len(images) == 1
+ assert 'hello-world:latest' in images[0].attrs['RepoTags']
+
def test_load_error(self):
client = docker.from_env(version=TEST_API_VERSION)
with pytest.raises(docker.errors.ImageLoadError):
diff --git a/tests/integration/models_services_test.py b/tests/integration/models_services_test.py
index 39cccf8..cb8eca2 100644
--- a/tests/integration/models_services_test.py
+++ b/tests/integration/models_services_test.py
@@ -1,12 +1,12 @@
import unittest
import docker
+import pytest
from .. import helpers
from .base import TEST_API_VERSION
from docker.errors import InvalidArgument
from docker.types.services import ServiceMode
-import pytest
class ServiceTest(unittest.TestCase):
@@ -182,6 +182,7 @@ class ServiceTest(unittest.TestCase):
service.reload()
assert not service.attrs['Spec'].get('Labels')
+ @pytest.mark.xfail(reason='Flaky test')
def test_update_retains_networks(self):
client = docker.from_env(version=TEST_API_VERSION)
network_name = helpers.random_name()