saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

environment variable logic

Browse source
This commit is contained in:
Daniel Wallace 2017-10-12 10:23:40 -06:00
parent 37abb1d06a
commit 2573a74ac1
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/kitchen/.kitchen.yml
View file

@ -79,9 +79,9 @@ suites:
verifier:
name: shell
remote_exec: false
<% if ENV['TEST_JUNIT_XML_PATH'].nil? %>
<% if ENV['TESTS_JUNIT_XML_PATH'].nil? %>
command: pytest -v tests/integration/$KITCHEN_SUITE
<% else %>
command: pytest --junit-xml <%= ENV['TEST_JUNIT_XML_PATH'] % [ENV['KITCHEN_SUITE'], ENV['KITCHEN_PLATFORM']] %> -v tests/integration/$KITCHEN_SUITE
command: pytest --junit-xml <%= ENV['TESTS_JUNIT_XML_PATH'] %> -v tests/integration/$KITCHEN_SUITE
<% end %>
<% end %>

2
tests/kitchen/test_kitchen.py
View file

@ -49,7 +49,7 @@ def func_builder(testdir):
def func(self):
self.testdir = testdir
if 'TESTS_XML_OUTPUT_DIR' in os.environ:
self.env['TEST_JUNIT_XML_PATH'] = '{0}/kitchen.tests.{1}.%s.%s.xml'.format(
self.env['TESTS_JUNIT_XML_PATH'] = '{0}/kitchen.tests.{1}.$KITCHEN_SUITE.$KITCHEN_PLATFORM.xml'.format(
os.environ.get('TESTS_XML_OUTPUT_DIR'),
self.testdir,
)