Merge lp:~smoser/curtin/trunk.trusty-raid5bcache into lp:~curtin-dev/curtin/trunk

[Scott Moser]

vmtest: do not expect sda-part2 to exist in /dev/disk/by-dname on trusty

This never worked, but we did not see failure before because of a
test case never properly executing.

trunk will now reliably fail like this:
======================================================================
FAIL: test_dname (vmtests.test_raid5_bcache.TrustyTestRaid5Bcache)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/fast/curtin/fix-1514094-v1/tests/vmtests/__init__.py", line 577, in test_dname
    self.assertIn(link, contents)
AssertionError: 'sda-part2' not found in ['bcache0', 'md0']

The reason for that is not actually regression, but fix of the test. my change to tests/vmtests/__init__.py:
     def test_dname(self):
- if (os.path.exists(self.td.mnt + "ls_dname") and
- self.disk_to_check is not None):
- with open(os.path.join(self.td.mnt, "ls_dname"), "r") as fp:
+ fpath = os.path.join(self.td.collect, "ls_dname")
+ if (os.path.exists(fpath) and self.disk_to_check is not None):
+ with open(fpath, "r") as fp:
                 contents = fp.read().splitlines()
             for diskname, part in self.disk_to_check.items():
                 if part is not 0:

Previously the test was not actually doing anything as self.td.mnt did not have a trailing '/', resulting in os.path.exists always returning false. So this test would always pass but never did what was desired.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:316
https://server-team-jenkins.canonical.com/job/curtin-ci/37/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/35/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/37/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

trunk will now reliably fail like this:
======================================================================
FAIL: test_dname (vmtests.test_raid5_bcache.TrustyTestRaid5Bcache)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/fast/curtin/fix-1514094-v1/tests/vmtests/__init__.py", line 577, in test_dname
    self.assertIn(link, contents)
AssertionError: 'sda-part2' not found in ['bcache0', 'md0']

The reason for that is not actually regression, but fix of the test. my change to tests/vmtests/__init__.py:
     def test_dname(self):
- if (os.path.exists(self.td.mnt + "ls_dname") and
- self.disk_to_check is not None):
- with open(os.path.join(self.td.mnt, "ls_dname"), "r") as fp:
+ fpath = os.path.join(self.td.collect, "ls_dname")
+ if (os.path.exists(fpath) and self.disk_to_check is not None):
+ with open(fpath, "r") as fp:
                 contents = fp.read().splitlines()
             for diskname, part in self.disk_to_check.items():
                 if part is not 0:

Previously the test was not actually doing anything as self.td.mnt did not have a trailing '/', resulting in os.path.exists always returning false. So this test would always pass but never did what was desired.

[Diogo Matsubara (matsubara)]

Tests passed successfully with the workaround: https://server-team-jenkins.canonical.com/job/curtin-vmtest/25/

=== modified file 'tests/vmtests/test_raid5_bcache.py'
--- tests/vmtests/test_raid5_bcache.py	2015-11-30 22:57:37 +0000
+++ tests/vmtests/test_raid5_bcache.py	2015-12-05 03:10:55 +0000
@@ -85,3 +85,7 @@
 class TrustyTestRaid5Bcache(TestMdadmBcacheAbs):
     __test__ = True
     release = "trusty"
+    # FIXME(LP: #1523037): dname does not work on trusty, so we cannot expect
+    # sda-part2 to exist in /dev/disk/by-dname as we can on other releases
+    # when dname works on trusty, then we need to re-enable the expectation
+    disk_to_check = {'md0': 0}