summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-01-28 07:55:34 -0500
committerNick Mathewson <nickm@torproject.org>2020-01-28 07:55:34 -0500
commit27099ffe6a6db70f08bd1d06b602d7313053c399 (patch)
treea8a0d9ff02009efbda6767cf1e3c809749c52dc6
parentaba31e2187808257b250bf469895330f273d7746 (diff)
parent9d771ccc86a7b8f04a40d619b78f7d99f67c176f (diff)
downloadtor-27099ffe6a6db70f08bd1d06b602d7313053c399.tar.gz
tor-27099ffe6a6db70f08bd1d06b602d7313053c399.zip
Merge remote-tracking branch 'tor-github/pr/1689'
-rw-r--r--.travis.yml2
-rw-r--r--changes/ticket330754
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ccd2107fd2..6792c47ad4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,8 +97,6 @@ matrix:
os: osx
- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os: osx
- ## test-stem sometimes hangs on Travis
- - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
## (Linux only) Use a recent Linux image (Ubuntu Bionic)
dist: bionic
diff --git a/changes/ticket33075 b/changes/ticket33075
new file mode 100644
index 0000000000..69698d90b3
--- /dev/null
+++ b/changes/ticket33075
@@ -0,0 +1,4 @@
+ o Testing:
+ - Stop allowing failures on the Travis CI stem tests job. It looks like all
+ the stem hangs we were seeing are now fixed, but let's make sure we see
+ them if they happen again. Closes ticket 33075.