Merge lp:~jibel/ubuntu-server-iso-testing/test-machineid into lp:ubuntu-server-iso-testing

[Jean-Baptiste Lallement]

[C de-Avillez (hggdh2)]

Go for it. Does it affect servers?

review: Approve

[Jean-Baptiste Lallement (jibel)]

On 10/12/2011 08:34 PM, C de-Avillez wrote:
> Review: Approve
>
> Go for it. Does it affect servers?
No only desktop images installed from a live cd.

--
Jean-Baptiste
irc: jibel

=== modified file 'templates.desktop/test_cases/default/test'
--- templates.desktop/test_cases/default/test	2011-06-10 09:54:52 +0000
+++ templates.desktop/test_cases/default/test	2011-10-12 15:34:33 +0000
@@ -22,6 +22,7 @@
 import logging
 import os.path
 import unittest
+import time, datetime
 
 logging.basicConfig(level=logging.DEBUG)
 
@@ -33,5 +34,17 @@
         self.assertEqual(t_fh.write('a'), None)
         self.assertEqual(t_fh.close(), None)
 
+    def test_20DBusMachineId(self):
+        """Test that machine Id is there and freshly generated"""
+        machine_id = '/var/lib/dbus/machine-id'
+
+        self.assertTrue(os.path.exists(machine_id))
+
+        mid_mtime = os.path.getmtime(machine_id)
+        now = time.mktime(datetime.datetime.now().timetuple())
+
+        # Check that the machine-id is less than 120seconds old
+        self.assertTrue((now - mid_mtime ) < 120 )
+
 if __name__ == '__main__':
     unittest.main()

=== modified file 'templates.desktop/test_cases/livesession/test'
--- templates.desktop/test_cases/livesession/test	2011-08-19 10:49:45 +0000
+++ templates.desktop/test_cases/livesession/test	2011-10-12 15:34:33 +0000
@@ -22,10 +22,12 @@
 import logging
 import os.path
 import unittest
+import time, datetime
 
 logging.basicConfig(level=logging.DEBUG)
 
 class DefaultTest(unittest.TestCase):
+    machine_id = '/var/lib/dbus/machine-id'
 
     def test_10ReadWrite(self):
         t_fh = open(os.path.join('/tmp', 'a'), 'w')
@@ -33,5 +35,21 @@
         self.assertEqual(t_fh.write('a'), None)
         self.assertEqual(t_fh.close(), None)
 
+    def test_20DBusMachineId(self):
+        """Test that machine Id is there and freshly generated"""
+
+        self.assertTrue(os.path.exists(self.machine_id))
+
+        mid_mtime = os.path.getmtime(self.machine_id)
+        now = time.mktime(datetime.datetime.now().timetuple())
+
+        # Check that the machine-id is less than 120seconds old
+        self.assertTrue((now - mid_mtime ) < 120 )
+
+    def test_30NoRofsMachineId(self):
+        """ machine-id must not exists on the rofs"""
+        rofs_machine_id = os.path.join('/rofs', self.machine_id)
+        self.assertFalse(os.path.exists(rofs_machine_id))
+
 if __name__ == '__main__':
     unittest.main()