Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test-backend, run-casper: Remove proxy vars instead of setting to "". 

Setting http_proxy to the empty string caused a spurious error from
xmlsec:

>>> import os
>>> os.environ["http_proxy"] = ""
>>> import xmlsec
error : Unknown IO error

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-10-28 15:12:00 -07:00 committed by Tim Abbott
parent c3bf7c6889
commit f077508c6d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/run-casper
View File

@ -18,8 +18,8 @@ ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
os.environ["CASPER_TESTS"] = "1" os.environ["CASPER_TESTS"] = "1"
os.environ["PHANTOMJS_EXECUTABLE"] = os.path.join(ZULIP_PATH, "node_modules/.bin/phantomjs") os.environ["PHANTOMJS_EXECUTABLE"] = os.path.join(ZULIP_PATH, "node_modules/.bin/phantomjs")
os.environ["http_proxy"] = "" os.environ.pop("http_proxy", "")
os.environ["https_proxy"] = "" os.environ.pop("https_proxy", "")
usage = """test-js-with-casper [options] usage = """test-js-with-casper [options]
test-js-with-casper # Run all test files test-js-with-casper # Run all test files

4
tools/test-backend
View File

@ -189,8 +189,8 @@ def main() -> None:
default_parallel = os.cpu_count() default_parallel = os.cpu_count()
# Remove proxy settings for running backend tests # Remove proxy settings for running backend tests
os.environ["http_proxy"] = "" os.environ.pop("http_proxy", "")
os.environ["https_proxy"] = "" os.environ.pop("https_proxy", "")
from zerver.lib.test_fixtures import update_test_databases_if_required, \ from zerver.lib.test_fixtures import update_test_databases_if_required, \
remove_test_run_directories remove_test_run_directories