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

[Max Brustkern]

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

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.

[Francis Ginther (fginther)]

Looks reasonable.

review: Approve

[Francis Ginther (fginther)]

Oops! please update the comment to match.

review: Needs Fixing

[lp:~canonical-platform-qa/ubuntu-test-cases/fix-desktop-tests]

51. By Francis Ginther on 2015-09-25

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

=== modified file 'testsuites/usit/dbus_machine_id/test.py'
--- testsuites/usit/dbus_machine_id/test.py	2015-03-17 15:28:59 +0000
+++ testsuites/usit/dbus_machine_id/test.py	2015-09-25 19:31:51 +0000
@@ -30,9 +30,10 @@
     MACHINE_ID_FILE = '/etc/machine-id'
     MACHINE_ID_FILE_FALLBACK = '/var/lib/dbus/machine-id'
 
-    # Expected age of the file is 5 minutes (300 seconds) which is an arbitrary
-    # value sane in VM with low resources as well as bare metal environments
-    EXPECTED_AGE = 300
+    # Expected age of the file is 30 minutes (1800 seconds) which is an
+    # arbitrary value sane in VM with low resources as well as bare metal
+    # environments
+    EXPECTED_AGE = 1800
 
     def test_machine_id(self):
         """Machine Id is there and log content and age."""