Merge lp:~xnox/utah/test-server-squashfs into lp:utah

[Dimitri John Ledkov]

static-validation: test squashfs on the server

[Max Brustkern (nuclearbob)]

The current precise daily server i386 image (md5sum 3399c37b03637c9108303be3f5019445) does not contain an install/filesystem.squashfs file. We may want the decorator to be something like:
@unittest.skipUnless(ubiquity_image or (st_variant == 'server' && st_release > 'precise'), "Skipping for alternate images.")

The current decorator will also skip netboot/mini images, so the "Skipping for alternate images." comment may be too specific, but I don't know if we can or do validate those with this tool anyway.

[lp:~xnox/utah/test-server-squashfs]

855. By Max Brustkern on 2013-04-10

Merged docstring updates

856. By Max Brustkern on 2013-04-10

Adding wait_for_booted change

857. By Max Brustkern on 2013-04-10

Deprecated run scripts

858. By Max Brustkern on 2013-04-10

Fixed LP #1158743

859. By Max Brustkern on 2013-04-10

Fixed issue running nosetests on directory

860. By Max Brustkern on 2013-04-10

Added docstring to setup file

861. By Max Brustkern on 2013-04-11

Fixing call to sshcheck that doesn't match function signature

[Dimitri John Ledkov (xnox)]

Tightened the check on the decorator & updated the comment to be more precise.

review: Needs Resubmitting

[lp:~xnox/utah/test-server-squashfs]

862. By Dimitri John Ledkov on 2013-04-15

Wubi _is_ shipped in raring

[Max Brustkern (nuclearbob)]

Looks good, thanks.

review: Approve

[Max Brustkern (nuclearbob)]

Actually, one more thing. Do you mind adding a debian changelog entry so that it'll be attributed correctly to you? We're developing version 0.11.0 now. Thanks!

[Max Brustkern (nuclearbob)]

Actually, it looks like the next version should be 0.11ubuntu1 by our current scheme. Sorry for the confusion.

[lp:~xnox/utah/test-server-squashfs]

863. By Dimitri John Ledkov on 2013-04-15

Check squashfs on the server images as well during ISO static
validation.

[Dimitri John Ledkov (xnox)]

I did a catch up from trunk and added changelog entry, the current one is still marked unreleased....

[Max Brustkern (nuclearbob)]

Thanks. We've had some discussions about the best way to handle that since we're not in the archive and probably won't be any time soon, but we are a native package. I'll see if I can find the mailing list stuff and forward it to you, and if you want to send anything to the list about it, feel free, I think we could use more voices on the topic that are as well-versed in debian specifics as you are.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-10 15:42:26 +0000
+++ debian/changelog	2013-04-15 21:13:27 +0000
@@ -32,6 +32,10 @@
   [ Andy Doan ]
   * Log process that has machine reserved. (LP: #1158743)
 
+  [ Dmitrijs Ledkovs ]
+  * Check squashfs on the server images as well during ISO static
+    validation.
+
  -- Max Brustkern <[e-mail]>  Wed, 10 Apr 2013 11:06:41 -0400
 
 utah (0.9.2ubuntu1) quantal; urgency=low

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2013-04-04 14:55:25 +0000
+++ utah/isotest/iso_static_validation.py	2013-04-15 21:13:27 +0000
@@ -314,10 +314,6 @@
         self.assertEqual(stderr, '')
         files_list = open(os.path.join(DATA_PATH, 'file_list_ubiquity'))
         exclude_files = []
-        if self.st_release >= 'r':
-            # wubi is not shipped in raring
-            exclude_files.append('autorun.inf')
-            exclude_files.append('wubi.exe')
         logging.debug('Check if relevant files are present in the iso')
         for list_server in files_list:
             path = list_server.rstrip()
@@ -385,7 +381,9 @@
         self.assertEqual(stderr, '')
         self.assertIn('Linux kernel', stdout)
 
-    @unittest.skipUnless(ubiquity_image, "Skipping for non ubiquity images")
+    @unittest.skipUnless(ubiquity_image or
+                         (st_variant == 'server' and st_release > 'precise'),
+                         "Skipping for d-i images without squashfs.")
     def test_filesystem_squashfs(self):
         """Test if filesystem.squashfs is present and its contents.
 
@@ -393,7 +391,12 @@
 
         """
         logging.debug('Extracting the filesystem.squashfs')
-        squashfs_path = self.iso.extract('casper/filesystem.squashfs',
+        if ubiquity_image:
+            squashfs_name = 'casper/filesystem.squashfs'
+        else:
+            squashfs_name = 'install/filesystem.squashfs'
+
+        squashfs_path = self.iso.extract(squashfs_name,
                                          self.temp_dir)
         logging.debug('Checking the file is an actual .squashfs')
         cmd = ["file", squashfs_path]
@@ -404,6 +407,10 @@
         self.assertEqual(stderr, '')
         self.assertIn("Squashfs filesystem", stdout)
 
+        # Skipping vmlinuz image extraction on server images
+        if not ubiquity_image:
+            return
+
         #unsquashfs extracts only in pwd
         cwd = os.getcwd()
         try: