summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSviatoslav Sydorenko <wk@sydorenko.org.ua>2018-04-22 22:31:01 +0200
committerSviatoslav Sydorenko <wk@sydorenko.org.ua>2018-04-22 22:31:01 +0200
commit4b0f8ae7eda78b994e516b1438ac5ae6721d96ea (patch)
tree8df56e1a8cb8e2bdefec5bffe64abeeca5447eb4
parent2a1f5b204f0f4778ba101ebfa85f3ddff9597196 (diff)
downloadcherrypy-git-4b0f8ae7eda78b994e516b1438ac5ae6721d96ea.tar.gz
Rename junit file to results.xml
-rw-r--r--.gitignore2
-rw-r--r--appveyor.yml2
-rw-r--r--pytest.ini2
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e19befdb..6ffd1573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ sphinx/source/_build
.pydevproject
# test results in junit format for Appveyor
-/.test-results/pytest/junit-test-results.xml
+/.test-results/pytest/results.xml
# coverage results
/.coverage
diff --git a/appveyor.yml b/appveyor.yml
index 19f57678..469d9e9b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@ test_script:
after_test:
- ps: |
$wc = New-Object 'System.Net.WebClient'
- $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\.test-results\pytest\junit-test-results.xml))
+ $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\.test-results\pytest\results.xml))
#deploy_script:
#- ps: >-
diff --git a/pytest.ini b/pytest.ini
index 9ea6279f..5dd88962 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
[pytest]
norecursedirs=dist build .tox
-addopts=-v -rxs --junitxml=.test-results/pytest/junit-test-results.xml --cov=cherrypy --cov-report term-missing:skip-covered --cov-report xml
+addopts=-v -rxs --junitxml=.test-results/pytest/results.xml --cov=cherrypy --cov-report term-missing:skip-covered --cov-report xml
doctest_optionflags=ALLOW_UNICODE ELLIPSIS