From 14d2d97ba6e460ff0f322890dd9a829681b45fb7 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 27 Sep 2020 12:43:19 +0200 Subject: [PATCH] test: rename scenario withnetns -> netns This makes the naming consistent with scenarios added in later commits. --- .travis.yml | 2 +- test/run-tests.sh | 2 +- test/scenarios/{withnetns.py => netns.py} | 0 test/tests.nix | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename test/scenarios/{withnetns.py => netns.py} (100%) diff --git a/.travis.yml b/.travis.yml index 8a487e4..c3fe269 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - secure: "xXCFZ7g+k5YmCGm8R8l3bZElVmt+RD1KscG3kGr5w4HyyDPTzFetPo+sT8bUpysDU0u3HWhfVhHtpog2mhNhwVl3tQwKXea3dHKC1i6ypBg3gjDngmJRR5wo++ocYDpK8qPaU7m/jHQTNFnTA4CbmMcc05GcYx/1Ai/ZGkNwWFjdIcVeOUoiol33gykMOXIGDg2qlXudt33wP53FHbX8L4fxzodWfAuxKK4AoGprxy5eSnU7LCaXxxJmu4HwuV+Ux2U1NfE/E33cvhlUvTQCswVSZFG06mg8rwhMG1ozsDvlL2itZlu/BeUQH5y3XMMlnJIUXUazkRBibf1w/ebVjpOF+anqkqmq8tcbFEa7T+RJeVTIsvP+L8rE8fcmuZtdg9hNmgRnLmaeT0vVwD1L2UqW9HdRyujdoS0jPYuoc1W7f1JQWfAPhBPQ1SrtKyNNqcbVJ34aN7b+4vCzRpQL1JTbmjzQIWhkiKN1qMo1v/wbIydW8yka4hc4JOfdQLaAJEPI1eAC1MLotSAegMnwKWE1dzm66MuPSipksYjZrvsB28cV4aCVUffIuRhrSr1i2afRHwTpNbK9U4/576hah15ftUdR79Sfkcoi1ekSQTFGRvkRIPYtkKLYwFa3jVA41qz7+IIZCf4TsApy3XDdFx91cRub7yPq9BeZ83A+qYQ=" jobs: - TestModules=1 STABLE=1 SCENARIO=default - - TestModules=1 STABLE=1 SCENARIO=withnetns + - TestModules=1 STABLE=1 SCENARIO=netns - PKG=hwi STABLE=1 - PKG=hwi STABLE=0 - PKG=lightning-charge STABLE=1 diff --git a/test/run-tests.sh b/test/run-tests.sh index 2263d7d..d1bb80e 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -149,7 +149,7 @@ build() { buildTest "$@" else scenario=default buildTest "$@" - scenario=withnetns buildTest "$@" + scenario=netns buildTest "$@" fi } diff --git a/test/scenarios/withnetns.py b/test/scenarios/netns.py similarity index 100% rename from test/scenarios/withnetns.py rename to test/scenarios/netns.py diff --git a/test/tests.nix b/test/tests.nix index 808e694..9d7020b 100644 --- a/test/tests.nix +++ b/test/tests.nix @@ -22,7 +22,7 @@ import ./make-test.nix rec { # needed because duplicity requires 270 MB of free temp space, regardless of backup size. virtualisation.diskSize = 1024; - nix-bitcoin.netns-isolation.enable = (scenario == "withnetns"); + nix-bitcoin.netns-isolation.enable = (scenario == "netns"); services.bitcoind.extraConfig = mkForce "connect=0";