Merge pull request #48024 from gtmanfred/2017.7

add pytest coverage and xml junits

.kitchen.yml

@@ -43,21 +43,20 @@ provisioner:
     repo: git
     testingdir: /testing
   salt_copy_filter:
+    - __pycache__
+    - '*.pyc'
     - .bundle
+    - .tox
     - .kitchen
-    - .kitchen.yml
     - artifacts
-    - Gemfile
     - Gemfile.lock
-    - README.rst
-    - .travis.yml
   state_top:
     base:
       "os:Windows":
         - match: grain
         - prep_windows
       "*":
-        - git.salt
+        - <%= ENV['KITCHEN_STATE'] || 'git.salt' %>
   pillars:
     top.sls:
       base:

pytest.ini

@@ -1,4 +0,0 @@
-[pytest]
-addopts = --ssh-tests -ra -sv
-testpaths = tests
-norecursedirs = tests/kitchen

requirements/pytest.txt

@@ -1,3 +1,4 @@
 pytest>=3.5.0
 pytest-helpers-namespace
 pytest-tempdir
+pytest-cov

tox.ini

@@ -1,7 +1,12 @@
 [tox]
-envlist = py27,py34,py35,py36
+envlist = py27,py3
 
 [testenv]
 deps = -r{toxinidir}/requirements/tests.txt
-commands = pytest --rootdir {toxinidir} {posargs:--no-print-logs --run-destructive}
+commands = pytest --rootdir {toxinidir} {posargs}
 passenv = LANG HOME
+
+[pytest]
+addopts = --log-file /tmp/salt-runtests.log --no-print-logs --ssh-tests -ra -sv
+testpaths = tests
+norecursedirs = tests/kitchen