Merge lp:~psivaa/utah/changetopending into lp:utah

[Para Siva]

The images will first be available in 'pending' stub and not under 'current'. So the test should check the image contents against the 'pending' repositories.

[Javier Collado (javier.collado)]

Thanks for the merge request.

I see in iso_static_validation.py a few more places in which current is being
used either as a variable name, a documentation string or a path. Have you
checked if the change to pending is needed also in some of those places?

[Para Siva (psivaa)]

I have not touched the variable names. They could remain as they are, technically. Also making the variable names to pending does not make a lot of sense. We are in fact testing the current image but only difference is that before certain smoke tests the current images will be under 'pending' stub in cdimages.

The only place where 'current' value is not changes is in line 292, where buildid is compared. This is intentional because in the cdimage schema, the buildid stub is right above 'current'

[Javier Collado (javier.collado)]

Thanks for the explanation. It looks good to me, but I'd like Max to take a look at it as well
before merging.

review: Approve

[Max Brustkern (nuclearbob)]

Looks good to me.

review: Approve

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2013-04-19 11:24:33 +0000
+++ utah/isotest/iso_static_validation.py	2013-05-14 13:00:36 +0000
@@ -184,7 +184,7 @@
     def test_sha256_checksum(self):
         """Test if the ISO SHA checksum matches what is given in the server."""
         current_iso_digest = {}
-        sha256sum_url = os.path.join(self.url, 'current', 'SHA256SUMS')
+        sha256sum_url = os.path.join(self.url, 'pending', 'SHA256SUMS')
         try:
             fh = urllib2.urlopen(sha256sum_url)
         except urllib2.HTTPError, e:
@@ -222,7 +222,7 @@
     def test_files_list(self):
         """Test if the list repository file matches the content of the ISO."""
         list_url = os.path.join(
-            self.url, 'current', '{}.list'
+            self.url, 'pending', '{}.list'
             .format('-'.join([self.st_release, st_variant, self.st_arch])))
 
         try:
@@ -251,7 +251,7 @@
     def test_manifest(self):
         """Test if the ISO manifest matches the one in the server."""
         manifest_url = os.path.join(
-            self.url, 'current', '{}.manifest'
+            self.url, 'pending', '{}.manifest'
             .format('-'.join([self.st_release, st_variant, self.st_arch])))
 
         try: