Merge lp:~cprov/adt-cloud-worker/test-timeout into lp:adt-cloud-worker

[Celso Providelo]

Applying largest timeouts found on the original auto-package-testing setup.

Applying largest timeouts found on the original auto-package-testing setup. They should only affect large sources as linux, binutils, glibc and libreoffice, however a possible side-effect would be taking longer to fail ordinary broken tests (which has not being observed so far).

[Paul Larson (pwlars)]

Seems to be a reasonable compromise until they can be defined in source packages.

review: Approve

[Joe Talbott (joetalbott)]

Looks okay to me. I don't like seeing the same lines duplicated in a file, but that might just be me.

review: Approve

[Para Siva (psivaa)]

Approve,

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-04-28 04:29:08 +0000
+++ adt_cloud_worker/__init__.py	2015-04-28 16:11:40 +0000
@@ -216,6 +216,12 @@
         '-d',
         '--apt-source', request_configuration['package_name'],
         '--output-dir', request_configuration['result_dir'],
+        # XXX cprov 20150428: largest timeout values found in the original
+        # auto-package-testing setup. Ideally they should be applied as
+        # source based overrides (linux, glibc, binutils, libreoffice, etc).
+        '--timeout-build=14400',
+        '--timeout-copy=5400',
+        '--timeout-test=20000',
     ]
     if 'apt_pocket' in request_configuration:
         adt_run_args += [

=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
--- adt_cloud_worker/tests/test_cloud_worker.py	2015-04-28 04:25:25 +0000
+++ adt_cloud_worker/tests/test_cloud_worker.py	2015-04-28 16:11:40 +0000
@@ -69,6 +69,9 @@
                 '-d',
                 '--apt-source', 'some_package_name',
                 '--output-dir', '/tmp/some/dir',
+                '--timeout-build=14400',
+                '--timeout-copy=5400',
+                '--timeout-test=20000',
                 '---',
                 'ssh',
                 '-s', get_uci_nova_path(),
@@ -90,6 +93,9 @@
                 '-d',
                 '--apt-source', 'some_package_name',
                 '--output-dir', '/tmp/some/dir',
+                '--timeout-build=14400',
+                '--timeout-copy=5400',
+                '--timeout-test=20000',
                 '--apt-pocket', 'foo', '--apt-upgrade',
                 '---',
                 'ssh',