Merge lp:~canonical-platform-qa/ubuntu-test-cases/fix-desktop-tests into lp:ubuntu-test-cases/desktop

Proposed by Max Brustkern
Status: Merged
Approved by: Francis Ginther
Approved revision: no longer in the source branch.
Merged at revision: 51
Proposed branch: lp:~canonical-platform-qa/ubuntu-test-cases/fix-desktop-tests
Merge into: lp:ubuntu-test-cases/desktop
Diff against target: 17 lines (+4/-3)
1 file modified
testsuites/usit/dbus_machine_id/test.py (+4/-3)
To merge this branch: bzr merge lp:~canonical-platform-qa/ubuntu-test-cases/fix-desktop-tests
Reviewer Review Type Date Requested Status
Francis Ginther Needs Fixing
Review via email: mp+272466@code.launchpad.net

Commit message

Raise allowable age to account for longer installation and post-installation tasks

Description of the change

This check was failing, with the time for me usually between 600 and 800 seconds. I think using a higher value gives us headroom if we have multiple runs slowing down a machine, but I can adjust it as needed.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Looks reasonable.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Oops! please update the comment to match.

review: Needs Fixing
51. By Francis Ginther

Raise allowable age to account for longer installation and post-installation task [nuclearbob]

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'testsuites/usit/dbus_machine_id/test.py'
2--- testsuites/usit/dbus_machine_id/test.py 2015-03-17 15:28:59 +0000
3+++ testsuites/usit/dbus_machine_id/test.py 2015-09-25 19:31:51 +0000
4@@ -30,9 +30,10 @@
5 MACHINE_ID_FILE = '/etc/machine-id'
6 MACHINE_ID_FILE_FALLBACK = '/var/lib/dbus/machine-id'
7
8- # Expected age of the file is 5 minutes (300 seconds) which is an arbitrary
9- # value sane in VM with low resources as well as bare metal environments
10- EXPECTED_AGE = 300
11+ # Expected age of the file is 30 minutes (1800 seconds) which is an
12+ # arbitrary value sane in VM with low resources as well as bare metal
13+ # environments
14+ EXPECTED_AGE = 1800
15
16 def test_machine_id(self):
17 """Machine Id is there and log content and age."""

Subscribers

People subscribed via source and target branches