Merge lp:~roadmr/checkbox/814085 into lp:checkbox

[Daniel Manrique]

A small tweak to the regex used to extract the release number in scripts/cdimage_resource, because I noticed that for instance Lucid is named "10.04.2 LTS" and the LTS part was throwing off the old regex.

This will be nice to have for future LTS releases if the naming convention sticks, but for Lucid it's probably not SRU-worthy as base checkbox doesn't report cdimage_resource data when submitting to launchpad. We'd have to see whether this affects our Lucid kernel SRU testing and whether this change is worth backporting to the version of checkbox used for those tests (it should integrate easily).

[Marc Tardif (cr3)]

Shouldn't the regex be "( LTS)?" rather than "( LTS)*"?

review: Needs Information

[lp:~roadmr/checkbox/814085]

969. By Daniel Manrique on 2011-08-10

Improved regex per cr3's suggestion

[Daniel Manrique (roadmr)]

> Shouldn't the regex be "( LTS)?" rather than "( LTS)*"?

Ah, yes, you're right. My approach was a bit more shotgun :)

I've fixed the regexp and updated the branch.

review: Needs Resubmitting

[Marc Tardif (cr3)]

Looks good, merging.

review: Approve

[Marc Tardif (cr3)]

By the way, you committed merge conflict code. I'll take care of that...

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-10 13:14:40 +0000
+++ debian/changelog	2011-08-10 15:48:32 +0000
@@ -15,8 +15,13 @@
     changes. (LP: #804369)
   * scripts/sleep_test: improve handling of NetworkManager DBus API
     changes. (LP: #808423)
+<<<<<<< TREE
   * Updated minimum_resolution test as per latest system requirements, leaving
     just one unified test. (LP: #767166)
+=======
+  * scripts/cdimage_resource: properly handle releases with "LTS" in their
+    name (LP: #814085)
+>>>>>>> MERGE-SOURCE
 
   [Javier Collado]
   * Checkbox exits with EX_NOINPUT if a whitelist or blacklist file is
@@ -26,6 +31,7 @@
   * Make the "Next" button the default action when Enter is pressed, to 
     streamline testing with the GTK interface.
 
+<<<<<<< TREE
   [Marc Tardif]
   * Fixed udevam not being found because /sbin not in PATH (LP: #597305)
   * Fixed hardware attachments for udev and dmi (LP: #822682)
@@ -38,6 +44,14 @@
   * Fix description for nautilus_file_create job (LP: #821141) 
 
  -- Daniel Manrique <[e-mail]>  Wed, 10 Aug 2011 09:13:10 -0400
+=======
+  [Brendan Donegan]
+  * Refactored job definition files.
+  * Fixed dependencies and test naming.
+  * Added Online CPU before/after suspend test.
+
+ -- Daniel Manrique <[e-mail]>  Thu, 21 Jul 2011 12:13:16 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.12.3) oneiric; urgency=low
 
 
=== modified file 'scripts/cdimage_resource'
--- scripts/cdimage_resource	2010-03-01 20:34:43 +0000
+++ scripts/cdimage_resource	2011-08-10 15:48:32 +0000
@@ -30,8 +30,9 @@
 
 def get_disk_from_string(string):
     # Ubuntu 8.04.1 "Hardy Heron" - Release amd64 (20080702.1)
+    # Ubuntu 10.04.2 LTS "Lucid Lynx" - Release amd64 (20110227.2)
     distributor_regex = r"(?P<distributor>[\w\-]+)"
-    release_regex = r"(?P<release>[\d\.]+)"
+    release_regex = r"(?P<release>[\d\.]+( LTS)?)"
     codename_regex = r"(?P<codename>[^_\"]+)"
     official_regex = r"(?P<official>[\w ]+)"
     architecture_regex = r"(?P<architecture>[\w\+]+)"