[tor-commits] [tor/release-0.3.4] Test: avoid spurious failures in make test-network-all

[nickm at torproject.org]

commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor <teor at torproject.org>
Date:   Fri Aug 24 10:25:25 2018 +1000

    Test: avoid spurious failures in make test-network-all
    
    Before running make test-network-all, delete old logs and test result
    files, to avoid spurious failures.
    
    Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am      | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert
 	mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+	rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 	@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 	if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 		echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 000000000..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+    - Before running make test-network-all, delete old logs and test result
+      files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.