UTAH

Merge lp:~xnox/utah/skip-wubi-more into lp:utah

  1. skip-wubi-more
  2. Merge into dev
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Paul Larson
Approved revision: 1102
Merged at revision: 1103
Proposed branch: lp:~xnox/utah/skip-wubi-more
Merge into: lp:utah
Diff against target: 12 lines (+1/-1)
1 file modified
utah/isotest/iso_static_validation.py (+1/-1)
To merge this branch: bzr merge lp:~xnox/utah/skip-wubi-more
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+323328@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Looks pretty straightforward, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/isotest/iso_static_validation.py'
2--- utah/isotest/iso_static_validation.py 2016-12-23 15:01:36 +0000
3+++ utah/isotest/iso_static_validation.py 2017-04-27 15:16:23 +0000
4@@ -305,7 +305,7 @@
5 @unittest.skipUnless(st_variant == 'desktop' and
6 st_arch != 'powerpc',
7 "Skipping images that aren't ubiquity-based.")
8- @unittest.skipIf(st_release >= 'wily', "Skipping images without wubi.")
9+ @unittest.skipIf(st_release != 'trusty', "Skipping images without wubi.")
10 def test_wubi(self):
11 """Test if wubi is present for desktop or dvd and it is a valid PE."""
12 logging.debug('Extracting wubi from the desktop images')

Subscribers

People subscribed via source and target branches