Merge lp:~laney/ubuntu-test-cases/dbus-etc-machine-id into lp:ubuntu-test-cases/desktop

[Iain Lane]

D-Bus uses /etc/machine-id and the other file is no longer necessary.

Do we need to keep backwards compatibility?

[Francis Ginther (fginther)]

This test isn't specific to new releases, right? In that case the fallback code is necessary to maintain functionality on trusty, utopic, etc.

So looks good as-is.

review: Approve

=== modified file 'testsuites/usit/dbus_machine_id/test.py'
--- testsuites/usit/dbus_machine_id/test.py	2013-01-03 23:28:37 +0000
+++ testsuites/usit/dbus_machine_id/test.py	2015-03-18 09:17:55 +0000
@@ -27,7 +27,8 @@
 
 
 class MachineIdTest(unittest.TestCase):
-    MACHINE_ID_FILE = '/var/lib/dbus/machine-id'
+    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
@@ -35,14 +36,23 @@
 
     def test_machine_id(self):
         """Machine Id is there and log content and age."""
-        logging.info('Checking that machine id file {!r} exists...'
-                     .format(self.MACHINE_ID_FILE))
-        self.assertTrue(os.path.exists(self.MACHINE_ID_FILE))
+        logging.info('Checking that machine id file {!r} or {!r} exists...'
+                     .format(self.MACHINE_ID_FILE,
+                             self.MACHINE_ID_FILE_FALLBACK))
 
         logging.info('Reading file...')
-        with open(self.MACHINE_ID_FILE) as f:
-            machine_id = f.read().rstrip()
-            logging.info('The machine id is {!r}'.format(machine_id))
+        try:
+            with open(self.MACHINE_ID_FILE) as f:
+                machine_id = f.read().rstrip()
+                logging.info('The machine id is {!r}'.format(machine_id))
+        except IOError:
+            logging.info('Couldn\'t open {!r}, trying {!r}'
+                         .format(self.MACHINE_ID_FILE,
+                                 self.MACHINE_ID_FILE_FALLBACK))
+            with open(self.MACHINE_ID_FILE_FALLBACK) as f:
+                self.MACHINE_ID_FILE = self.MACHINE_ID_FILE_FALLBACK
+                machine_id = f.read().rstrip()
+                logging.info('The machine id is {!r}'.format(machine_id))
 
         logging.info('Getting last modification time...')
         mtime = os.path.getmtime(self.MACHINE_ID_FILE)

=== modified file 'testsuites/usit/no_rofs_machine_id/test.py'
--- testsuites/usit/no_rofs_machine_id/test.py	2013-01-03 23:28:37 +0000
+++ testsuites/usit/no_rofs_machine_id/test.py	2015-03-18 09:17:55 +0000
@@ -26,17 +26,26 @@
 
 
 class NoRofsMachineId(unittest.TestCase):
-    MACHINE_ID_FILE = 'var/lib/dbus/machine-id'
+    MACHINE_ID_FILE = 'etc/machine-id'
+    MACHINE_ID_FILE_FALLBACK = 'var/lib/dbus/machine-id'
     ROFS_DIR = '/rofs'
 
     def test_no_rofs_machine_id(self):
         """Machine ID doesn't exist on the rofs."""
         rofs_machine_id = os.path.join(self.ROFS_DIR, self.MACHINE_ID_FILE)
+        rofs_machine_id_fallback = os.path.join(self.ROFS_DIR,
+                                                self.MACHINE_ID_FILE_FALLBACK)
         logging.info("Checking that machine id file under {} ({}) "
                      "doesn't exist"
                      .format(self.ROFS_DIR, rofs_machine_id))
         self.assertFalse(os.path.exists(rofs_machine_id),
                          'Machine ID file ({}) exists'.format(rofs_machine_id))
+        logging.info("Checking that machine id file under {} ({}) "
+                     "doesn't exist"
+                     .format(self.ROFS_DIR, rofs_machine_id_fallback))
+        self.assertFalse(os.path.exists(rofs_machine_id_fallback),
+                         'Machine ID file ({}) exists'
+                         .format(rofs_machine_id_fallback))
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.DEBUG,