Merge lp:~sergiusens/click/load-module into lp:click

Proposed by Svein Åge Lima on 2017-11-30
Status: Needs review
Proposed branch: lp:~sergiusens/click/load-module
Merge into: lp:click
Diff against target: 34 lines (+4/-1)
3 files modified
click_package/tests/integration/test_build_core_apps.py (+2/-0)
click_package/tests/integration/test_chroot.py (+1/-0)
debian/tests/run-tests.sh (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/click/load-module
Reviewer Review Type Date Requested Status
Colin Watson 2017-11-30 Needs Fixing on 2017-11-30
Review via email: mp+334501@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) :
review: Needs Fixing

Unmerged revisions

628. By Sergio Schvezov on 2017-06-07

load the overlay module before chroot creation for integration tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click_package/tests/integration/test_build_core_apps.py'
2--- click_package/tests/integration/test_build_core_apps.py 2017-06-07 18:49:42 +0000
3+++ click_package/tests/integration/test_build_core_apps.py 2017-11-30 03:11:52 +0000
4@@ -94,6 +94,8 @@
5
6 def _ensure_click_chroot(self):
7 if subprocess.call(self.chroot_cmd + ["exists"]) != 0:
8+ # In case the testbed doesn't have the module loaded.
9+ subprocess.check_call(["/sbin/modprobe", "overlay"])
10 subprocess.check_call(self.chroot_cmd + ["create"])
11
12 def configure(self):
13
14=== modified file 'click_package/tests/integration/test_chroot.py'
15--- click_package/tests/integration/test_chroot.py 2017-06-07 18:49:42 +0000
16+++ click_package/tests/integration/test_chroot.py 2017-11-30 03:11:52 +0000
17@@ -54,6 +54,7 @@
18 require_overlay()
19 cls.arch = subprocess.check_output(
20 ["dpkg", "--print-architecture"], universal_newlines=True).strip()
21+ subprocess.check_call(["/sbin/modprobe", "overlay"])
22 subprocess.check_call(cls.command(cls.arch, "create"))
23
24 @classmethod
25
26=== modified file 'debian/tests/run-tests.sh'
27--- debian/tests/run-tests.sh 2017-06-06 21:04:01 +0000
28+++ debian/tests/run-tests.sh 2017-11-30 03:11:52 +0000
29@@ -10,4 +10,4 @@
30 --with-systemduserunitdir=/usr/lib/systemd/user \
31 --disable-packagekit
32
33-TEST_INTEGRATION=1 python3 -m unittest discover -vv click_package.tests.integration
34+TEST_INTEGRATION=1 python3 -m unittest run -vv click_package.tests.integration.test_chroot.TestChroot

Subscribers

People subscribed via source and target branches

to all changes: