Merge branch 'maint-0.3.4' into maint-0.3.5

This commit is contained in:
Nick Mathewson 2018-10-31 11:02:58 -04:00
commit 0d124488f8
2 changed files with 12 additions and 4 deletions

6
changes/bug27948 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (tests):
- Treat backtrace test failures as expected on BSD-derived systems
(NetBSD, OpenBSD, and macOS/Darwin) until we solve bug 17808.
(FreeBSD failures have been treated as expected since 18204 in 0.2.8.)
Fixes bug 27948; bugfix on 0.2.5.2-alpha.

View File

@ -44,10 +44,12 @@ print("BAD")
for l in LINES:
print("{}".format(l), end="")
if sys.platform.startswith('freebsd'):
# See bug #17808 if you know how to fix this.
print("Test failed; but FreeBSD is known to have backtrace problems.\n"
"Treating as 'SKIP'.")
if (sys.platform.startswith('freebsd') or sys.platform.startswith('netbsd') or
sys.platform.startswith('openbsd') or sys.platform.startswith('darwin')):
# See bug #17808 if you know how to fix backtraces on BSD-derived systems
print("Test failed; but {} is known to have backtrace problems."
.format(sys.platform))
print("Treating as 'SKIP'.")
sys.exit(77)
sys.exit(1)