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

Proposed by Celso Providelo on 2015-04-28
Status: Merged
Approved by: Celso Providelo on 2015-04-28
Approved revision: 41
Merged at revision: 41
Proposed branch: lp:~cprov/adt-cloud-worker/test-timeout
Merge into: lp:adt-cloud-worker
Diff against target: 40 lines (+12/-0)
2 files modified
adt_cloud_worker/__init__.py (+6/-0)
adt_cloud_worker/tests/test_cloud_worker.py (+6/-0)
To merge this branch: bzr merge lp:~cprov/adt-cloud-worker/test-timeout
Reviewer Review Type Date Requested Status
Para Siva (community) Approve on 2015-04-28
Joe Talbott (community) Approve on 2015-04-28
Paul Larson 2015-04-28 Approve on 2015-04-28
Review via email: mp+257662@code.launchpad.net

Commit message

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

Description of the change

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).

To post a comment you must log in.
Paul Larson (pwlars) wrote :

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

review: Approve
Joe Talbott (joetalbott) wrote :

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) wrote :

Approve,

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'adt_cloud_worker/__init__.py'
2--- adt_cloud_worker/__init__.py 2015-04-28 04:29:08 +0000
3+++ adt_cloud_worker/__init__.py 2015-04-28 16:11:40 +0000
4@@ -216,6 +216,12 @@
5 '-d',
6 '--apt-source', request_configuration['package_name'],
7 '--output-dir', request_configuration['result_dir'],
8+ # XXX cprov 20150428: largest timeout values found in the original
9+ # auto-package-testing setup. Ideally they should be applied as
10+ # source based overrides (linux, glibc, binutils, libreoffice, etc).
11+ '--timeout-build=14400',
12+ '--timeout-copy=5400',
13+ '--timeout-test=20000',
14 ]
15 if 'apt_pocket' in request_configuration:
16 adt_run_args += [
17
18=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
19--- adt_cloud_worker/tests/test_cloud_worker.py 2015-04-28 04:25:25 +0000
20+++ adt_cloud_worker/tests/test_cloud_worker.py 2015-04-28 16:11:40 +0000
21@@ -69,6 +69,9 @@
22 '-d',
23 '--apt-source', 'some_package_name',
24 '--output-dir', '/tmp/some/dir',
25+ '--timeout-build=14400',
26+ '--timeout-copy=5400',
27+ '--timeout-test=20000',
28 '---',
29 'ssh',
30 '-s', get_uci_nova_path(),
31@@ -90,6 +93,9 @@
32 '-d',
33 '--apt-source', 'some_package_name',
34 '--output-dir', '/tmp/some/dir',
35+ '--timeout-build=14400',
36+ '--timeout-copy=5400',
37+ '--timeout-test=20000',
38 '--apt-pocket', 'foo', '--apt-upgrade',
39 '---',
40 'ssh',

Subscribers

People subscribed via source and target branches