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

Proposed by Daniel Manrique on 2011-07-21
Status: Merged
Merged at revision: 992
Proposed branch: lp:~roadmr/checkbox/814085
Merge into: lp:checkbox
Diff against target: 55 lines (+16/-1) (has conflicts)
2 files modified
debian/changelog (+14/-0)
scripts/cdimage_resource (+2/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~roadmr/checkbox/814085
Reviewer Review Type Date Requested Status
Marc Tardif (community) 2011-07-21 Approve on 2011-08-10
Daniel Manrique Resubmit on 2011-08-10
Review via email: mp+68720@code.launchpad.net

Description of the change

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).

To post a comment you must log in.
Marc Tardif (cr3) wrote :

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

review: Needs Information
lp:~roadmr/checkbox/814085 updated on 2011-08-10
969. By Daniel Manrique on 2011-08-10

Improved regex per cr3's suggestion

Daniel Manrique (roadmr) wrote :

> 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: Resubmit
Marc Tardif (cr3) wrote :

Looks good, merging.

review: Approve
Marc Tardif (cr3) wrote :

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

Preview Diff

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

Subscribers

People subscribed via source and target branches