December 2019 - tor-commits - lists.torproject.org

[tor/master] Travis: Use zstd in our Travis Linux builds
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 43424866496e6f7613ec652c798fec3b8b460c6d Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:35:24 2019 +1000 Travis: Use zstd in our Travis Linux builds Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build dependency. Closes ticket 32242. --- .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f7e8e4be..79e232f0c 100644 --- a/… [View More]

1 0

[chutney/master] Travis: Use the latest OS images
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit ec283436b47020baf5fdf5eed4dd5e0f22611b5d Author: teor <teor(a)torproject.org> Date: Thu Nov 28 13:08:58 2019 +1000 Travis: Use the latest OS images Use macOS 10.14. Stay on Ubuntu Xenial until 32630 is fixed. Part of 32631. --- .travis.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d24f07..bf50ae6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,7 +103,7 @@ matrix: -… [View More]

1 0

[chutney/master] Travis: Remove unused sudo: key
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 0ec7a4901578dbe73fa2213c390f481c33c4fbd6 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 19:21:02 2019 +1000 Travis: Remove unused sudo: key --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf50ae6..7ca2c74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -153,10 +153,6 @@ matrix: #allow_failures: # - env: TOR="master-nightly" NETWORK_FLAVOUR="basic-min" -## We don't need sudo. (The "apt:" stanza after this … [View More]

1 0

[chutney/master] Travis: Diagnostics for 32630
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 0cfed0bec20a1b57a8cdad8ed80fb429d4ccea5a Author: teor <teor(a)torproject.org> Date: Thu Nov 28 13:58:01 2019 +1000 Travis: Diagnostics for 32630 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 971f825..07ed4ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -214,6 +214,8 @@ install: - $PYTHON --version - if command -v shellcheck ; then shellcheck --version; fi - tor --version + ## List the permissions on … [View More]

1 0

[chutney/master] Travis: Use the latest Python versions
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit e6f47dd9681b67c4b8b3fe293c195b9211a6ffab Author: teor <teor(a)torproject.org> Date: Thu Nov 28 13:14:07 2019 +1000 Travis: Use the latest Python versions Also: * Set $PYTHON for macOS python3 * Use "python" as the default for $PYTHON * Respect $PYTHON in unit-tests.sh Part of 32631. --- .travis.yml | 40 ++++++++++++++++++++++++++++------------ tests/unit-tests.sh | 14 +++++++++----- 2 files changed, 37 insertions(+), 17 deletions(-) … [View More]diff --git a/.travis.yml b/.travis.yml index 7ca2c74..971f825 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ os: - linux ## We also use macOS for some networks +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: matrix: # include creates Linux, python 2.7, tor master builds by default # we use tor master to catch tor issues before stable releases @@ -112,10 +114,17 @@ matrix: ## Test all supported python releases + ## Pre-installed in macOS + - os: osx + language: c + python: + ## python 3 is already installed, under this name + env: PYTHON="python3" TOR="stable-release" + ## Pre-installed in Travis xenial: ## https://docs.travis-ci.com/user/reference/xenial/#python-support ## End of Life: 1 January 2020 - ## https://www.python.org/dev/peps/pep-0373/#id2 + ## https://www.python.org/dev/peps/pep-0373/#update - python: "2.7" ## End of Life: December 2021 ## https://www.python.org/dev/peps/pep-0494/#lifespan @@ -123,23 +132,28 @@ matrix: ## End of Life: June 2023 ## https://www.python.org/dev/peps/pep-0537/#lifespan - python: "3.7" - ## Stable: 20 October 2019 - ## (Switch from 3.8-dev to 3.8, and check for 3.9-dev) + + ## Extra Installs ## End of Life: October 2024 ## https://www.python.org/dev/peps/pep-0569/#lifespan - - python: "3.8-dev" + - python: "3.8" + ## Python 3.9 + ## Travis Dev Package: ???? + ## (Add 3.9-dev) + ## Stable: 10 October 2020 + ## (Switch from 3.9-dev to 3.9, and check for {3.10,4.0}-dev) + ## End of Life: October 2025 + ## https://www.python.org/dev/peps/pep-0596/#lifespan + #- python: "3.9-dev" - python: "nightly" - # PyPy versions + + ## PyPy versions ## End of Life: "forever" ## http://doc.pypy.org/en/latest/faq.html#how-long-will-pypy-support-python2 ## But chutney can decide not to support python 2 after 1 Jan 2020. - ## Travis Xenial does not support pypy2.7 - #- python: "pypy2.7" + - python: "pypy" ## PyPy does not have documented end of life dates - - python: "pypy3.5" - ## PyPy 3.6 is currently in alpha - ## Travis Xenial does not support pypy3.6-dev yet? - #- python: "pypy3.6-dev" + - python: "pypy3" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -195,7 +209,9 @@ install: ## List installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi - - python --version + ## Use the default spelling for python, unless it is overridden + - export PYTHON=${PYTHON:-python} + - $PYTHON --version - if command -v shellcheck ; then shellcheck --version; fi - tor --version diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh index 07e8b32..2bf99c1 100755 --- a/tests/unit-tests.sh +++ b/tests/unit-tests.sh @@ -5,10 +5,13 @@ set -e # Verbose mode set -v - # Output is prefixed with the name of the script myname=$(basename "$0") +# Respect the user's $PYTHON +PYTHON=${PYTHON:-python} +echo "$myname: using python '$PYTHON'" + echo "$myname: finding chutney directory" TEST_DIR=$(dirname "$0") CHUTNEY_DIR=$(dirname "$TEST_DIR") @@ -25,7 +28,7 @@ test -n "$LOG_FILE" unset CHUTNEY_DEBUG export CHUTNEY_DEBUG -lib/chutney/Debug.py | tee "$LOG_FILE" +$PYTHON lib/chutney/Debug.py | tee "$LOG_FILE" LOG_FILE_LINES=$(wc -l < "$LOG_FILE") test "$LOG_FILE_LINES" -eq 1 @@ -34,7 +37,7 @@ export LOG_FILE test -n "$LOG_FILE" export CHUTNEY_DEBUG=1 -lib/chutney/Debug.py | tee "$LOG_FILE" +$PYTHON lib/chutney/Debug.py | tee "$LOG_FILE" LOG_FILE_LINES=$(wc -l < "$LOG_FILE") test "$LOG_FILE_LINES" -eq 2 @@ -48,7 +51,7 @@ LOG_FILE=$(mktemp) export LOG_FILE test -n "$LOG_FILE" -lib/chutney/Templating.py torrc_templates/common.i | tee "$LOG_FILE" +$PYTHON lib/chutney/Templating.py torrc_templates/common.i | tee "$LOG_FILE" grep -q owning_controller_process "$LOG_FILE" grep -q connlimit "$LOG_FILE" grep -q controlport "$LOG_FILE" @@ -64,7 +67,8 @@ export LOG_FILE test -n "$LOG_FILE" # Choose an arbitrary port -PYTHONPATH=$PYTHONPATH:lib lib/chutney/Traffic.py 9999 | tee "$LOG_FILE" +PYTHONPATH=$PYTHONPATH:lib $PYTHON lib/chutney/Traffic.py 9999 \ + | tee "$LOG_FILE" # Traffic.py produces output with a single newline. But we don't want to get # too picky about the details: allow an extra line and a few extra chars. [View Less]

1 0

[chutney/master] Travis: Test with Tor 0.4.2
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit a691883b791ecb95547f952282091cd4f332adb4 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 13:13:31 2019 +1000 Travis: Test with Tor 0.4.2 Part of 32631. --- .travis.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cb5e0a..7d24f07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,26 +71,26 @@ matrix: - shellcheck - tor env: TOR="0.3.5-nightly" … [View More]

1 0

[chutney/master] Travis: Run Chutney jobs in Ubuntu Bionic images
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit c430471c065bad8bc2a1a4a27bd68de7037c0dc2 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:48:56 2019 +1000 Travis: Run Chutney jobs in Ubuntu Bionic images Except for pypy jobs, which need to run on Xenial, because pypy isn't packaged for Travis Bionic yet. Closes 32630. --- .travis.yml | 53 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index … [View More]

1 0

[chutney/master] Travis: Turn off Tor's Sandbox in Chutney's CI
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 0038a97a49257bf9b8ede801783e7f83b3fb17d0 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:46:36 2019 +1000 Travis: Turn off Tor's Sandbox in Chutney's CI We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722. Part of 32630. --- .travis.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88039a4..50a7fe8 100644 --… [View More]

1 0

[chutney/master] Travis: Run 0.2.9 on Xenial
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit f4ecd5876a9aa671afdcbdf5b9a2adb1aa7b57f5 Author: teor <teor(a)torproject.org> Date: Fri Dec 20 09:14:43 2019 +1000 Travis: Run 0.2.9 on Xenial Bionic has an OpenSSL version mismatch between Tor's build, and Travis' image. Part of 32630. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bdb518..2115e53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,12 +68,16 @@ matrix: ## … [View More]

1 0

[chutney/master] Travis: Set pipefail
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit dc19f219eba7bf15a9a04a4e6a038482c829b139 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 11:56:41 2019 +1000 Travis: Set pipefail --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 07ed4ff..88039a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,10 @@ addons: # some point to speed up builds. update: true +before_install: + ## Set pipefail: we may use pipes in future + - set -o pipefail || echo … [View More]

1 0