From fba3ce4d5ba5ec9093a1cfa397e4432f24d7f44a Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 27 May 2019 19:38:06 -0400
Subject: handle xunit2

---
 source/merge.d | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source/merge.d')

diff --git a/source/merge.d b/source/merge.d
index 7de55fe..e14f07a 100644
--- a/source/merge.d
+++ b/source/merge.d
@@ -194,6 +194,14 @@ auto integration_test(ref Conda conda, string outdir, test_runner_t runner, test
         return 1;
     }
 
+    if (runner.program == "pytest" || runner.program == "py.test") {
+        string testconf = "pytest.ini";
+        if (!testconf.exists) {
+            testconf = "setup.cfg";
+        }
+        pytest_xunit2(testconf);
+    }
+
     if (conda.sh(runner.program ~ " " ~ runner.args ~ " --basetemp=" ~ basetemp) > 1) {
         return 1;
     }
-- 
cgit