debian/changelog

-reprotest (0.7.11) UNRELEASED; urgency=medium
+reprotest (0.7.11) unstable; urgency=medium
 
-  *  WIP - changelog will be generated with gbp-dch at release time.
-     Please dont add changelog entries here until then.
+  [ Ross Vandegrift ]
+  * Allow user to override timeouts from the environment.
 
- -- Holger Levsen <holger@debian.org>  Sat, 26 Oct 2019 13:28:51 +0200
+  [ Holger Levsen ]
+  * Drop 'short' timeout and use 'install' timeout instead. Closes: #897442.
+  * setup.py: bump version number for this release.
+
+ -- Holger Levsen <holger@debian.org>  Tue, 14 Jan 2020 14:48:01 +0100
 
 reprotest (0.7.10) unstable; urgency=medium
 

reprotest/__init__.py

@@ -54,7 +54,7 @@ def get_all_servers():
 
 class Testbed(adt_testbed.Testbed):
 
-    def check_exec2(self, argv, stdout=False, kind='short', xenv=[]):
+    def check_exec2(self, argv, stdout=False, kind='install', xenv=[]):
         """Like check_exec but does not bomb on stderr, and can pass xenv."""
         (code, out, err) = self.execute(argv,
                                         stdout=(stdout and subprocess.PIPE or None),

reprotest/lib/adt_testbed.py

@@ -49,8 +49,12 @@ SYSTEM_INTERFACES = {
         'fedora': FedoraInterface,
         }
 
-timeouts = {'short': 100, 'copy': 300, 'install': 3000, 'test': 10000,
-            'build': 100000}
+timeouts = {
+    'copy': int(os.getenv('REPROTEST_TIMEOUT_COPY', 300)),
+    'install': int(os.getenv('REPROTEST_TIMEOUT_INSTALL', 3000)),
+    'test': int(os.getenv('REPROTEST_TIMEOUT_TEST', 10000)),
+    'build': int(os.getenv('REPROTEST_TIMEOUT_BUILD', 100000)),
+}
 
 
 class Testbed:
@@ -431,7 +435,7 @@ class Testbed:
             ll = list(map(urllib.parse.unquote, ll))
         return ll
 
-    def execute(self, argv, xenv=[], stdout=None, stderr=None, kind='short'):
+    def execute(self, argv, xenv=[], stdout=None, stderr=None, kind='install'):
         '''Run command in testbed.
 
         The commands stdout/err will be piped directly to autopkgtest and its log
@@ -489,7 +493,7 @@ class Testbed:
 
         return (proc.returncode, out, err)
 
-    def check_exec(self, argv, stdout=False, kind='short'):
+    def check_exec(self, argv, stdout=False, kind='install'):
         '''Run argv in testbed.
 
         If stdout is True, capture stdout and return it. Otherwise, don't