particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: adapt 'libdir' argument for BuildRoot's ctor

Browse source 
As of commit 1e3c0ae "unified libdir handling", the libdir argument
for the BuildRoot constructor is not a keyword argument anymore.
Adapt the argument accordingly.
This commit is contained in:
Christian Kellner 2020-10-20 17:34:04 +02:00 • committed by David Rheinsberg
parent e919f66609
commit 9ef642228f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/mod/test_buildroot.py
View file

@ -29,7 +29,7 @@ class TestBuildRoot(test.TestBase):
var.mkdir() var.mkdir()
monitor = NullMonitor(sys.stderr.fileno()) 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) r = root.run(["/usr/bin/true"], monitor)
self.assertEqual(r.returncode, 0) self.assertEqual(r.returncode, 0)
@ -49,7 +49,7 @@ class TestBuildRoot(test.TestBase):
logfile = os.path.join(self.tmp.name, "log.txt") 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: open(logfile, "w") as log:
monitor = LogMonitor(log.fileno()) monitor = LogMonitor(log.fileno())
@ -72,7 +72,7 @@ class TestBuildRoot(test.TestBase):
data = "42. cats are superior to dogs" data = "42. cats are superior to dogs"
monitor = NullMonitor(sys.stderr.fileno()) 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) r = root.run(["/usr/bin/echo", data], monitor)
self.assertEqual(r.returncode, 0) self.assertEqual(r.returncode, 0)
@ -92,7 +92,7 @@ class TestBuildRoot(test.TestBase):
scripts = os.path.join(self.locate_test_data(), "scripts") scripts = os.path.join(self.locate_test_data(), "scripts")
monitor = NullMonitor(sys.stderr.fileno()) 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"] ro_binds = [f"{scripts}:/scripts"]
@ -126,7 +126,7 @@ class TestBuildRoot(test.TestBase):
scripts = os.path.join(self.locate_test_data(), "scripts") scripts = os.path.join(self.locate_test_data(), "scripts")
monitor = NullMonitor(sys.stderr.fileno()) 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"] ro_binds = [f"{scripts}:/scripts"]