Merge pull request #47670 from gtmanfred/2017.7

add a pytest.ini and update a dependency for kitchen

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'test-kitchen', :git => 'https://github.com/gtmanfred/test-kitchen.git'
+gem 'test-kitchen', '>=1.21.0'
 gem 'kitchen-salt', :git => 'https://github.com/saltstack/kitchen-salt.git'
 gem 'kitchen-sync'
 gem 'git'

pytest.ini

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

tests/conftest.py

@@ -105,7 +105,7 @@ def pytest_addoption(parser):
     test_selection_group.addoption(
         '--proxy',
         '--proxy-tests',
-        dest='ssh',
+        dest='proxy',
         action='store_true',
         default=False,
         help='Run proxy tests'