diff options
Diffstat (limited to 'source/merge.d')
-rw-r--r-- | source/merge.d | 8 |
1 files changed, 8 insertions, 0 deletions
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; } |