diff options
| author | teor <teor@torproject.org> | 2019-04-10 19:03:43 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-10 19:03:43 +1000 |
| commit | 12b9bfc05f3a163b44f0f8b6638f027de16e622b (patch) | |
| tree | ceeaaefe130bdd5953eca62c441e8005effbd9c3 /src/test | |
| parent | acec0192c3d6400316037cdc3e4c9093c1919252 (diff) | |
| download | tor-12b9bfc05f3a163b44f0f8b6638f027de16e622b.tar.gz tor-12b9bfc05f3a163b44f0f8b6638f027de16e622b.zip | |
test: Also avoid reading the system default torrc in integration tests
Part of 29702.
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/test_key_expiration.sh | 3 | ||||
| -rwxr-xr-x | src/test/test_keygen.sh | 3 | ||||
| -rw-r--r-- | src/test/test_rebind.py | 6 | ||||
| -rwxr-xr-x | src/test/zero_length_keys.sh | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh index cf6608634d..3474210607 100755 --- a/src/test/test_key_expiration.sh +++ b/src/test/test_key_expiration.sh @@ -66,10 +66,11 @@ trap "rm -rf '$DATA_DIR'" 0 DATA_DIR=`cd "${DATA_DIR}" && pwd` touch "${DATA_DIR}/empty_torrc" +touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" -TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}" +TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc" ##### SETUP # diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh index 455f9e7d42..7afff271cb 100755 --- a/src/test/test_keygen.sh +++ b/src/test/test_keygen.sh @@ -83,10 +83,11 @@ trap "rm -rf '$DATA_DIR'" 0 DATA_DIR=`cd "${DATA_DIR}" && pwd` touch "${DATA_DIR}/empty_torrc" +touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" -TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc" +TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc" ##### SETUP # diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 4c41e1f437..a376e62cb4 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -84,6 +84,8 @@ data_dir = sys.argv[2] empty_torrc_path = os.path.join(data_dir, 'empty_torrc') open(empty_torrc_path, 'w').close() +empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc') +open(empty_defaults_torrc_path, 'w').close() tor_process = subprocess.Popen([tor_path, '-DataDirectory', data_dir, @@ -92,7 +94,9 @@ tor_process = subprocess.Popen([tor_path, '-Log', 'debug stdout', '-LogTimeGranularity', '1', '-FetchServerDescriptors', '0', - '-f', empty_torrc_path], + '-f', empty_torrc_path, + '--defaults-torrc', empty_defaults_torrc_path, + ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index 3c61f8d465..5635bdfd89 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -43,10 +43,11 @@ fi trap "rm -rf '$DATA_DIR'" 0 touch "$DATA_DIR"/empty_torrc +touch "$DATA_DIR"/empty_defaults_torrc # DisableNetwork means that the ORPort won't actually be opened. # 'ExitRelay 0' suppresses a warning. -TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc" +TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc $DATA_DIR/empty_defaults_torrc" if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then |