Move feature tests into tests/feature where possible

Author: ekohl

tests/feature/foreman-proxy/__init__.py

@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature('foreman')
-
-
 def test_foreman_organization(organization):
     assert organization
 

tests/foreman_proxy_test.py tests/feature/foreman-proxy/base_test.pytests/foreman_proxy_test.py renamed to tests/feature/foreman-proxy/base_test.py

@@ -2,8 +2,6 @@
 
 import pytest
 
-pytestmark = pytest.mark.feature('foreman')
-
 FOREMAN_HOST = 'localhost'
 FOREMAN_PORT = 3000
 

tests/feature/foreman/__init__.py

@@ -1,7 +1,5 @@
 import pytest
 
-pytestmark = pytest.mark.feature('foreman')
-
 
 @pytest.mark.parametrize("compute_resource", ['AzureRm', 'EC2', 'GCE', 'Libvirt', 'Openstack', 'Vmware'])
 def test_foreman_compute_resources(foremanapi, compute_resource):

tests/foreman_api_test.py tests/feature/foreman/api_test.pytests/foreman_api_test.py renamed to tests/feature/foreman/api_test.py

@@ -1,7 +1,5 @@
 import pytest
 
-pytestmark = pytest.mark.feature('foreman')
-
 
 @pytest.mark.parametrize("foreman_plugin", ['foreman_azure_rm', 'foreman_google'])
 def test_foreman_compute_resources(foremanapi, foreman_plugin):

tests/foreman_test.py tests/feature/foreman/base_test.pytests/foreman_test.py renamed to tests/feature/foreman/base_test.py

@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature('hammer')
-
-
 def test_hammer_ping(server):
     hammer = server.run("hammer ping")
     assert hammer.succeeded