jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move converge() to a test module, and use a short timeout for tests.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2015-06-14 17:11:29 -04:00
commit 06db577105
7 changed files with 69 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compose/project.py
View file

@ -6,7 +6,7 @@ from functools import reduce
from docker.errors import APIError
from .config import get_service_name_from_net, ConfigurationError
from .const import LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF
from .const import LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF, DEFAULT_TIMEOUT
from .service import Service
from .container import Container
from .legacy import check_for_legacy_containers
@ -212,7 +212,7 @@ class Project(object):
smart_recreate=False,
insecure_registry=False,
do_build=True,
timeout=None):
timeout=DEFAULT_TIMEOUT):
services = self.get_services(service_names, include_deps=start_deps)