Add timeout to Composition.run and exec

camptocamp · May 29, 2017 · b90b0f2 · b90b0f2
1 parent 4af56e1
commit b90b0f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/c2cwsgiutils/acceptance/composition.py b/c2cwsgiutils/acceptance/composition.py
@@ -83,15 +83,15 @@ def restart(self, container):
                                    'restart', '%s_%s_1' % (self.project_name, container)],
                                    stderr=subprocess.STDOUT))
 
-    def run(self, container, *command):
+    def run(self, container, timeout=None, *command):
         subprocess.check_call(['docker-compose', '--file', self.composition,
                                '--project-name', self.project_name, 'run', '--rm', container] + list(command),
-                              env=Composition._get_env(), stderr=subprocess.STDOUT)
+                              env=Composition._get_env(), stderr=subprocess.STDOUT, timeout=timeout)
 
-    def exec(self, container, *command):
+    def exec(self, container, timeout=None, *command):
         subprocess.check_call(['docker-compose', '--file', self.composition,
                                '--project-name', self.project_name, 'exec', '-T', container] + list(command),
-                              env=Composition._get_env(), stderr=subprocess.STDOUT)
+                              env=Composition._get_env(), stderr=subprocess.STDOUT, timeout=timeout)
 
     @staticmethod
     def _get_env():

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '0.11.1'
+VERSION = '0.11.2'
 HERE = os.path.abspath(os.path.dirname(__file__))
 INSTALL_REQUIRES = open(os.path.join(HERE, 'rel_requirements.txt')).read().splitlines()