diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-06-19 08:09:45 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-06-19 08:09:45 -0400 |
| commit | 3cb6a690be60fcdab60130402ff88dcfc0657596 (patch) | |
| tree | d9748ef003832ba291739250dcc9bcb5cf65989a | |
| parent | 7a83aa4f5042905844cb9ab48a4876becd8f2175 (diff) | |
| parent | 94f4d0968b57db8b3346a5b51b9e0c2ed3e8d98f (diff) | |
| download | tor-3cb6a690be60fcdab60130402ff88dcfc0657596.tar.gz tor-3cb6a690be60fcdab60130402ff88dcfc0657596.zip | |
Merge branch 'maint-0.4.7'
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | doc/HACKING/WritingTests.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bec3043072..2ff664d861 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ variables: # llvm-symbolizer for sanitizer backtrace - if [ "$HARDENING" = yes ]; then apt-get install llvm; fi # TODO: This next line should not be debian-only. - - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi + - if [ "$STEM" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/network-health/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi diff --git a/Makefile.am b/Makefile.am index 1682f58b49..7567ca99c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -479,7 +479,7 @@ test-network-results: need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \ echo '$$STEM_SOURCE_DIR was not set.'; echo; \ - echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ + echo "To run these tests, git clone https://gitlab.torproject.org/tpo/network-health/stem ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ exit 1; \ fi diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md index 84f5f7f361..463a4ad4af 100644 --- a/doc/HACKING/WritingTests.md +++ b/doc/HACKING/WritingTests.md @@ -465,7 +465,7 @@ Let's assume you actually want to write a test for a previously untested controller feature. I'm picking the `exit-policy/*` GETINFO queries. Since these are a controller feature that we want to write an integration test for, the right file to modify is -`https://gitweb.torproject.org/stem.git/tree/test/integ/control/controller.py`. +`https://gitlab.torproject.org/tpo/network-health/stem/-/blob/master/test/integ/control/controller.py`. First off we notice that there is an integration test called `test_get_exit_policy()` that's already written. This exercises the interaction |