X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fintegration%2Fcmd_keys.py;h=079a5036d36c6e8942d6e61c20c3d18a9db09461;hb=c8402791b82947c49ba1d04f855dab04191607ca;hp=d9af1e09d7455603fad52ea4a5ef37986af5b6b2;hpb=67e09d80143c4dcad182730a7b73a3d1183e67da;p=tinc diff --git a/test/integration/cmd_keys.py b/test/integration/cmd_keys.py index d9af1e09..079a5036 100755 --- a/test/integration/cmd_keys.py +++ b/test/integration/cmd_keys.py @@ -7,25 +7,12 @@ import os from testlib import check, util from testlib.log import log +from testlib.const import RUN_ACCESS_CHECKS from testlib.feature import Feature from testlib.proc import Tinc from testlib.test import Test -def init(ctx: Test) -> Tinc: - """Initialize a node.""" - - node = ctx.node() - stdin = f""" - init {node} - set Port 0 - set Address localhost - set DeviceType dummy - """ - node.cmd(stdin=stdin) - return node - - TEST_DATA = b"foo bar baz" @@ -99,7 +86,7 @@ def test_rsa(foo: Tinc) -> None: key = util.read_text(rsa_priv) check.has_prefix(key, "-----BEGIN RSA PRIVATE KEY-----") - if os.name != "nt": + if RUN_ACCESS_CHECKS: log.info("remove access to private key") os.chmod(rsa_priv, 0) _, err = foo.cmd("generate-rsa-keys", "1024", code=1) @@ -136,7 +123,7 @@ def test_eddsa(foo: Tinc) -> None: check.has_prefix(util.read_text(ec_priv), "-----BEGIN ED25519 PRIVATE KEY-----") check.has_prefix(util.read_text(ec_pub), "Ed25519PublicKey") - if os.name != "nt": + if RUN_ACCESS_CHECKS: log.info("remove access to EC private key file") os.chmod(ec_priv, 0) _, err = foo.cmd("generate-ed25519-keys", code=1) @@ -155,4 +142,4 @@ def run_tests(foo: Tinc) -> None: with Test("run tests") as context: - run_tests(init(context)) + run_tests(context.node(init=True))