From f9de9052e1e63401bb0d824eeb3cf0677b6dfd7d Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 23 Jun 2019 13:31:47 +0300 Subject: [PATCH 1/3] On Travis, put random data in ~/.torrc --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5d5d95f6b3..1901d950a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,6 +191,9 @@ install: - python --version ## run stem tests if they are enabled. - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi + ## We don't want Tor tests to depends on default configuration file at + ## ~/.torrc. So we put some random bytes in there, to make sure it doesn't. + - dd ibs=1 count=1024 if=/dev/urandom > ~/.torrc script: # Skip test_rebind on macOS From 1d504a408d129bf561138360a5d727b37c0e29a9 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 23 Jun 2019 13:38:49 +0300 Subject: [PATCH 2/3] Add changes file --- changes/ticket30102 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/ticket30102 diff --git a/changes/ticket30102 b/changes/ticket30102 new file mode 100644 index 0000000000..c8b1148da3 --- /dev/null +++ b/changes/ticket30102 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - When running CI builds on Travis, put some random data in ~/.torrc, + to make sure no tests are dependent on default Tor configuration. + Resolves issue 30102. From 84f0f15066b10581c673525fe3c41d32511437e1 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 23 Jun 2019 14:12:05 +0300 Subject: [PATCH 3/3] Improve comment in .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1901d950a4..fe34fac255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,8 +191,9 @@ install: - python --version ## run stem tests if they are enabled. - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi - ## We don't want Tor tests to depends on default configuration file at - ## ~/.torrc. So we put some random bytes in there, to make sure it doesn't. + ## We don't want Tor tests to depend on default configuration file at + ## ~/.torrc. So we put some random bytes in there, to make sure we get build + ## failures in case Tor is reading it during CI jobs. - dd ibs=1 count=1024 if=/dev/urandom > ~/.torrc script: