Merge lp:~raharper/curtin/trunk.fix-build-deb-mock-udev-settle into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

Fix deb build by mocking call to udevadm settle

The sbuild chroot environment does not have the 'udevadm' command. A
recent unittest now invokes 'udevadm settle' which is not mocked and
failed due to the missing command in the build environment. Fix by
adding a mock to the call to udevadm.

[Ryan Harper (raharper)]

I've verified that sbuild'ing with this branch works.

1. ./tools/build-deb -S -us -uc
2. sbuild --arch-all -d xenial curtin_0.1.0~bzr504-0ubuntu1.dsc

The above fails on trunk, but is successful on this branch.

[Scott Moser (smoser)]

i'd like a link to the failure. but assuming the failure is that there is no 'udevadm' in the build environment (which is sane as we do not build-depend on it), then that seems fine.

review: Approve

[Joshua Powers (powersj)]

LGTM - thanks for fixing this :)

review: Approve

[Ryan Harper (raharper)]

On Tue, May 30, 2017 at 10:57 AM, Scott Moser <email address hidden> wrote:

> Review: Approve
>
> i'd like a link to the failure. but assuming the failure is that there is
> no 'udevadm' in the build environment (which is sane as we do not
> build-depend on it), then that seems fine.
>

 https://jenkins.ubuntu.com/server/job/curtin-build/179/console

>
> --
> https://code.launchpad.net/~raharper/curtin/trunk.fix-
> build-deb-mock-udev-settle/+merge/324793
> You are the owner of lp:~raharper/curtin/trunk.fix-
> build-deb-mock-udev-settle.
>

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

PASSED: Continuous integration, rev:504
https://jenkins.ubuntu.com/server/job/curtin-ci/525/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/525
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/525
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/525
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/525
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/525

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/525/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

+1

======================================================================
ERROR: test clear_holders.shutdown_bcache
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/<<PKGBUILDDIR>>/tests/unittests/test_clear_holders.py", line 159, in test_shutdown_bcache
    clear_holders.shutdown_bcache(device)
  File "/<<PKGBUILDDIR>>/curtin/block/clear_holders.py", line 144, in shutdown_bcache
    udev.udevadm_settle()
  File "/<<PKGBUILDDIR>>/curtin/udev.py", line 68, in udevadm_settle
    util.subp(settle_cmd)
  File "/<<PKGBUILDDIR>>/curtin/util.py", line 194, in subp
    return _subp(*args, **kwargs)
  File "/<<PKGBUILDDIR>>/curtin/util.py", line 115, in _subp
    raise ProcessExecutionError(cmd=args, reason=e)
ProcessExecutionError: Unexpected error while running command.
Command: ['udevadm', 'settle']
Exit code: -
Reason: [Errno 2] No such file or directory
Stdout: ''
Stderr: ''

=== modified file 'tests/unittests/test_clear_holders.py'
--- tests/unittests/test_clear_holders.py	2017-05-17 00:14:07 +0000
+++ tests/unittests/test_clear_holders.py	2017-05-30 15:50:37 +0000
@@ -129,13 +129,15 @@
             mock_block.path_to_kname.assert_called_with(self.test_syspath)
             mock_get_dmsetup_uuid.assert_called_with(self.test_syspath)
 
+    @mock.patch('curtin.block.clear_holders.udev.udevadm_settle')
     @mock.patch('curtin.block.clear_holders.get_bcache_sys_path')
     @mock.patch('curtin.block.clear_holders.util')
     @mock.patch('curtin.block.clear_holders.os')
     @mock.patch('curtin.block.clear_holders.LOG')
     @mock.patch('curtin.block.clear_holders.get_bcache_using_dev')
     def test_shutdown_bcache(self, mock_get_bcache, mock_log, mock_os,
-                             mock_util, mock_get_bcache_block):
+                             mock_util, mock_get_bcache_block,
+                             mock_udevadm_settle):
         """test clear_holders.shutdown_bcache"""
         #
         # pass in a sysfs path to a bcache block device,