X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=test%2Fintegration%2Fcommandline.py;fp=test%2Fintegration%2Fcommandline.py;h=411a0088de156f74fa265ba7dfd7cd967893c01d;hp=5db01d3dfd7713a4d9cba5c3a59030482814bccd;hb=c8402791b82947c49ba1d04f855dab04191607ca;hpb=66eb66ec8f872db3dc12e1d01101772918d69a4a diff --git a/test/integration/commandline.py b/test/integration/commandline.py index 5db01d3d..411a0088 100755 --- a/test/integration/commandline.py +++ b/test/integration/commandline.py @@ -18,15 +18,7 @@ from testlib.feature import SANDBOX_LEVEL def init(ctx: Test) -> Tinc: """Initialize new test nodes.""" - tinc = ctx.node() - stdin = f""" - init {tinc} - set Port 0 - set Address localhost - set DeviceType dummy - set Sandbox {SANDBOX_LEVEL} - """ - tinc.cmd(stdin=stdin) + tinc = ctx.node(init=f"set Sandbox {SANDBOX_LEVEL}") tinc.add_script(Script.TINC_UP) return tinc @@ -146,7 +138,7 @@ def test_relative_path(ctx: Test, chroot: bool) -> None: log.info("stopping tinc through '%s'", pidfile) foo.cmd("--pidfile", pidfile, "stop") - check.equals(0, tincd.wait()) + check.success(tincd.wait()) # Leave behind as debugging aid if there's an exception shutil.rmtree(shortcut)