diff options
| author | teor <teor@torproject.org> | 2020-02-12 12:18:59 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-12 12:18:59 +1000 |
| commit | 88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd (patch) | |
| tree | 7baea949c194e82cbd488d71b8c6824f03e084cb | |
| parent | 2b6df3da21803519c262099ab9dd950271f3ce11 (diff) | |
| parent | 9d771ccc86a7b8f04a40d619b78f7d99f67c176f (diff) | |
| download | tor-88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd.tar.gz tor-88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd.zip | |
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | changes/ticket33075 | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 7f7e7a5723..28a45788b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,8 +93,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. |