From 4b98440e6a90880f077826f1a1f134c10c1039f1 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 6 Jul 2018 12:49:19 -0400
Subject: [PATCH] Try harder to find the right output from Tox

---
 .circleci/run-tests.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index d3335fbcc..22599e1d6 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -43,7 +43,14 @@ from json import load
 from sys import stdin, stdout, argv
 result = load(stdin)
 for environ in argv[1].split(","):
-    messy_output = result["testenvs"][environ]["test"][-1]["output"]
+    # Heuristically discover which blob is probably the test output!
+    test_result = next(
+        result
+        for result
+        in result["testenvs"][environ]["test"]
+        if "test: allmydata." in result["output"]
+    )
+    messy_output = test_result["output"]
     stdout.write(messy_output.split("\n", 3)[3].strip() + "\n")
 ' "${TAHOE_LAFS_TOX_ENVIRONMENT}" < "${TOX_JSON}" > "${SUBUNIT1}"