Prechádzať zdrojové kódy

Merge remote-tracking branch 'tor-github/pr/1127'

Nick Mathewson 5 rokov pred
rodič
commit
167dd097e0
2 zmenil súbory, kde vykonal 8 pridanie a 0 odobranie
  1. 4 0
      .travis.yml
  2. 4 0
      changes/ticket30102

+ 4 - 0
.travis.yml

@@ -191,6 +191,10 @@ 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 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:
   # Skip test_rebind on macOS

+ 4 - 0
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.