summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Ruhland <felipe.ruhland@gmail.com>2018-01-02 22:46:17 -0200
committerFelipe Ruhland <felipe.ruhland@gmail.com>2018-01-03 00:21:56 -0200
commit663c6089e962f024eafad7fb5bcf88847dd8b28a (patch)
treec1073e8442d597f524866a1f20ddd605c6c643ec
parent0e0a8526801d207bfdf2e9011ab1348525437a79 (diff)
downloaddocker-py-663c6089e962f024eafad7fb5bcf88847dd8b28a.tar.gz
Fix test to make sure the initial mode is replicated
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
-rw-r--r--docker/models/services.py2
-rw-r--r--tests/integration/models_services_test.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/models/services.py b/docker/models/services.py
index 4c8acce..337ed44 100644
--- a/docker/models/services.py
+++ b/docker/models/services.py
@@ -116,7 +116,7 @@ class Service(Model):
``True``if successful.
"""
- if not self.attrs['Spec']['Mode'].get('Global'):
+ if 'Global' in self.attrs['Spec']['Mode'].keys():
raise InvalidArgument('Cannot scale a global container')
service_mode = ServiceMode('replicated', replicas)
diff --git a/tests/integration/models_services_test.py b/tests/integration/models_services_test.py
index 64aba66..15b87da 100644
--- a/tests/integration/models_services_test.py
+++ b/tests/integration/models_services_test.py
@@ -5,7 +5,7 @@ import docker
from .. import helpers
from .base import TEST_API_VERSION
from docker.errors import InvalidArgument
-from docker.models.services import ServiceMode
+from docker.types.services import ServiceMode
class ServiceTest(unittest.TestCase):
@@ -212,7 +212,7 @@ class ServiceTest(unittest.TestCase):
name=helpers.random_name(),
# ContainerSpec arguments
image="alpine",
- command="sleep 300"
+ command="sleep 300",
)
tasks = []
while len(tasks) == 0: