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

[Svein Åge Lima]

[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

=== modified file 'click_package/tests/integration/test_build_core_apps.py'
--- click_package/tests/integration/test_build_core_apps.py	2017-06-07 18:49:42 +0000
+++ click_package/tests/integration/test_build_core_apps.py	2017-11-30 03:11:52 +0000
@@ -94,6 +94,8 @@
 
     def _ensure_click_chroot(self):
         if subprocess.call(self.chroot_cmd + ["exists"]) != 0:
+            # In case the testbed doesn't have the module loaded.
+            subprocess.check_call(["/sbin/modprobe", "overlay"])
             subprocess.check_call(self.chroot_cmd + ["create"])
 
     def configure(self):

=== modified file 'click_package/tests/integration/test_chroot.py'
--- click_package/tests/integration/test_chroot.py	2017-06-07 18:49:42 +0000
+++ click_package/tests/integration/test_chroot.py	2017-11-30 03:11:52 +0000
@@ -54,6 +54,7 @@
         require_overlay()
         cls.arch = subprocess.check_output(
             ["dpkg", "--print-architecture"], universal_newlines=True).strip()
+        subprocess.check_call(["/sbin/modprobe", "overlay"])
         subprocess.check_call(cls.command(cls.arch, "create"))
 
     @classmethod

=== modified file 'debian/tests/run-tests.sh'
--- debian/tests/run-tests.sh	2017-06-06 21:04:01 +0000
+++ debian/tests/run-tests.sh	2017-11-30 03:11:52 +0000
@@ -10,4 +10,4 @@
         --with-systemduserunitdir=/usr/lib/systemd/user \
         --disable-packagekit
 
-TEST_INTEGRATION=1 python3 -m unittest discover -vv click_package.tests.integration
+TEST_INTEGRATION=1 python3 -m unittest run -vv click_package.tests.integration.test_chroot.TestChroot