From 9ef642228ff4f893ca06f378c2d4a3aa8251e83d Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 20 Oct 2020 17:34:04 +0200 Subject: [PATCH] test: adapt 'libdir' argument for BuildRoot's ctor As of commit 1e3c0ae "unified libdir handling", the libdir argument for the BuildRoot constructor is not a keyword argument anymore. Adapt the argument accordingly. --- test/mod/test_buildroot.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/mod/test_buildroot.py b/test/mod/test_buildroot.py index 60de5732..70e17377 100644 --- a/test/mod/test_buildroot.py +++ b/test/mod/test_buildroot.py @@ -29,7 +29,7 @@ class TestBuildRoot(test.TestBase): var.mkdir() monitor = NullMonitor(sys.stderr.fileno()) - with BuildRoot("/", runner, libdir=libdir, var=var) as root: + with BuildRoot("/", runner, libdir, var=var) as root: r = root.run(["/usr/bin/true"], monitor) self.assertEqual(r.returncode, 0) @@ -49,7 +49,7 @@ class TestBuildRoot(test.TestBase): logfile = os.path.join(self.tmp.name, "log.txt") - with BuildRoot("/", runner, libdir=libdir, var=var) as root, \ + with BuildRoot("/", runner, libdir, var=var) as root, \ open(logfile, "w") as log: monitor = LogMonitor(log.fileno()) @@ -72,7 +72,7 @@ class TestBuildRoot(test.TestBase): data = "42. cats are superior to dogs" monitor = NullMonitor(sys.stderr.fileno()) - with BuildRoot("/", runner, libdir=libdir, var=var) as root: + with BuildRoot("/", runner, libdir, var=var) as root: r = root.run(["/usr/bin/echo", data], monitor) self.assertEqual(r.returncode, 0) @@ -92,7 +92,7 @@ class TestBuildRoot(test.TestBase): scripts = os.path.join(self.locate_test_data(), "scripts") monitor = NullMonitor(sys.stderr.fileno()) - with BuildRoot("/", runner, libdir=libdir, var=var) as root: + with BuildRoot("/", runner, libdir, var=var) as root: ro_binds = [f"{scripts}:/scripts"] @@ -126,7 +126,7 @@ class TestBuildRoot(test.TestBase): scripts = os.path.join(self.locate_test_data(), "scripts") monitor = NullMonitor(sys.stderr.fileno()) - with BuildRoot("/", runner, libdir=libdir, var=var) as root: + with BuildRoot("/", runner, libdir, var=var) as root: ro_binds = [f"{scripts}:/scripts"]