aboutsummaryrefslogtreecommitdiff
path: root/delivery_merge/merge.py
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2019-05-12 00:07:33 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2019-05-12 00:07:33 -0400
commit84bae5eed1854d0cb4d701f7f9f87d86365e51a7 (patch)
tree2ab50b9dfa6ab6fdc7bac56bee2de9d557b36b52 /delivery_merge/merge.py
parentc2fb852e011c898f1ebf2eb8cca16a8b6265fb8f (diff)
downloaddelivery_merge-84bae5eed1854d0cb4d701f7f9f87d86365e51a7.tar.gz
Just work
Diffstat (limited to 'delivery_merge/merge.py')
-rw-r--r--delivery_merge/merge.py25
1 files changed, 13 insertions, 12 deletions
diff --git a/delivery_merge/merge.py b/delivery_merge/merge.py
index 87b0cc9..fb291a2 100644
--- a/delivery_merge/merge.py
+++ b/delivery_merge/merge.py
@@ -175,21 +175,22 @@ def integration_test(pkg_data, conda_env, results_root='.'):
def force_xunit2(project='.'):
configs = [os.path.abspath(os.path.join(project, x))
- for x in ['pytest.ini', 'setup.cfg']]
- create_config = not all([os.path.exists(x) for x in configs])
+ for x in ['pytest.ini', 'setup.cfg']]
- if create_config:
+ if any([os.path.exists(x) for x in configs]):
+ for filename in configs:
+ if not os.path.exists(filename):
+ continue
+
+ cfg = ConfigParser()
+ cfg.read(filename)
+ cfg['tool:pytest'] = {'junit_family': 'xunit2'}
+ with open(filename, 'w') as data:
+ cfg.write(data)
+ break
+ else:
data = """[pytest]\njunit_family = xunit2\n"""
with open('pytest.ini', 'w+') as cfg:
cfg.write(data)
return
- for filename in configs:
- if not os.path.exists(filename):
- continue
-
- cfg = ConfigParser()
- cfg.read(filename)
- cfg['tool:pytest']['junit_family'] = 'xunit2'
- cfg.write(filename)
- break