Fix flake8 E302 errors second round.

awx/main/tests/functional/api/test_adhoc.py

@@ -140,14 +140,17 @@ def test_get_inventory_ad_hoc_command_list(admin, alice, post_adhoc, get, invent
 def test_bad_data1(admin, post_adhoc):
     post_adhoc(reverse('api:ad_hoc_command_list'), {'module_name': 'command', 'module_args': None}, admin, expect=400)
 
+
 @pytest.mark.django_db
 def test_bad_data2(admin, post_adhoc):
     post_adhoc(reverse('api:ad_hoc_command_list'), {'job_type': 'baddata'}, admin, expect=400)
 
+
 @pytest.mark.django_db
 def test_bad_data3(admin, post_adhoc):
     post_adhoc(reverse('api:ad_hoc_command_list'), {'verbosity': -1}, admin, expect=400)
 
+
 @pytest.mark.django_db
 def test_bad_data4(admin, post_adhoc):
     post_adhoc(reverse('api:ad_hoc_command_list'), {'forks': -1}, admin, expect=400)

awx/main/tests/functional/api/test_settings.py

@@ -12,11 +12,11 @@ from django.core.urlresolvers import reverse
 from awx.conf.models import Setting
 
 
-'''
-Ensures that tests don't pick up dev container license file
-'''
 @pytest.fixture
 def mock_no_license_file(mocker):
+    '''
+    Ensures that tests don't pick up dev container license file
+    '''
     os.environ['AWX_LICENSE_FILE'] = '/does_not_exist'
     return None
 

awx/main/tests/functional/commands/test_cleanup_facts.py

@@ -39,11 +39,11 @@ def test_cleanup_granularity(fact_scans, hosts):
     assert 60 == deleted_count
 
 
-'''
-Delete half of the scans
-'''
 @pytest.mark.django_db
 def test_cleanup_older_than(fact_scans, hosts):
+    '''
+    Delete half of the scans
+    '''
     epoch = timezone.now()
     hosts(5)
     fact_scans(28, timestamp_epoch=epoch)
@@ -70,11 +70,11 @@ def test_cleanup_older_than_granularity_module(fact_scans, hosts):
     assert 20 == deleted_count
 
 
-'''
-Reduce the granularity of half of the facts scans, by half.
-'''
 @pytest.mark.django_db
 def test_cleanup_logic(fact_scans, hosts):
+    '''
+    Reduce the granularity of half of the facts scans, by half.
+    '''
     epoch = timezone.now()
     hosts = hosts(5)
     fact_scans(60, timestamp_epoch=epoch)

awx/main/tests/functional/commands/test_run_fact_cache_receiver.py

@@ -62,15 +62,15 @@ def test_process_fact_message_services(fact_msg_services):
     check_process_fact_message_module(fact_returned, fact_msg_services, 'services')
 
 
-'''
-We pickypack our fact sending onto the Ansible fact interface.
-The interface is <hostname, facts>. Where facts is a json blob of all the facts.
-This makes it hard to decipher what facts are new/changed.
-Because of this, we handle the same fact module data being sent multiple times
-and just keep the newest version.
-'''
 @pytest.mark.django_db
 def test_process_facts_message_ansible_overwrite(fact_scans, fact_msg_ansible):
+    '''
+    We pickypack our fact sending onto the Ansible fact interface.
+    The interface is <hostname, facts>. Where facts is a json blob of all the facts.
+    This makes it hard to decipher what facts are new/changed.
+    Because of this, we handle the same fact module data being sent multiple times
+    and just keep the newest version.
+    '''
     #epoch = timezone.now()
     epoch = datetime.fromtimestamp(fact_msg_ansible['date_key'])
     fact_scans(fact_scans=1, timestamp_epoch=epoch)

awx/main/tests/functional/conftest.py

@@ -44,23 +44,23 @@ from awx.main.models.notifications import (
 )
 
 
-'''
-Disable all django model signals.
-'''
 @pytest.fixture(scope="session", autouse=False)
 def disable_signals():
+    '''
+    Disable all django model signals.
+    '''
     mocked = mock.patch('django.dispatch.Signal.send', autospec=True)
     mocked.start()
 
 
-'''
-FIXME: Not sure how "far" just setting the BROKER_URL will get us.
-We may need to incluence CELERY's configuration like we do in the old unit tests (see base.py)
-
-Allows django signal code to execute without the need for redis
-'''
 @pytest.fixture(scope="session", autouse=True)
 def celery_memory_broker():
+    '''
+    FIXME: Not sure how "far" just setting the BROKER_URL will get us.
+    We may need to incluence CELERY's configuration like we do in the old unit tests (see base.py)
+
+    Allows django signal code to execute without the need for redis
+    '''
     settings.BROKER_URL='memory://localhost/'
 
 

awx/main/tests/functional/models/fact/test_get_host_fact.py

@@ -22,18 +22,18 @@ def test_newest_scan_exact(hosts, fact_scans):
     assert fact_found == fact_known
 
 
-'''
-Show me the most recent state of the sytem at any point of time.
-or, said differently
-For any timestamp, get the first scan that is <= the timestamp.
-'''
-
-'''
-Ensure most recent scan run is the scan returned.
-Query by future date.
-'''
 @pytest.mark.django_db
 def test_newest_scan_less_than(hosts, fact_scans):
+    '''
+    Show me the most recent state of the sytem at any point of time.
+    or, said differently
+    For any timestamp, get the first scan that is <= the timestamp.
+    '''
+
+    '''
+    Ensure most recent scan run is the scan returned.
+    Query by future date.
+    '''
     epoch = timezone.now()
     timestamp_future = epoch + timedelta(days=10)
     hosts = hosts(host_count=2)
@@ -51,11 +51,11 @@ def test_newest_scan_less_than(hosts, fact_scans):
     assert fact_found == fact_known
 
 
-'''
-Tests query Fact that is in the middle of the fact scan timeline, but not an exact timestamp.
-'''
 @pytest.mark.django_db
 def test_query_middle_of_timeline(hosts, fact_scans):
+    '''
+    Tests query Fact that is in the middle of the fact scan timeline, but not an exact timestamp.
+    '''
     epoch = timezone.now()
     timestamp_middle = epoch + timedelta(days=1, hours=3)
     hosts = hosts(host_count=2)
@@ -73,11 +73,11 @@ def test_query_middle_of_timeline(hosts, fact_scans):
     assert fact_found == fact_known
 
 
-'''
-Query time less than any fact scan. Should return None
-'''
 @pytest.mark.django_db
 def test_query_result_empty(hosts, fact_scans):
+    '''
+    Query time less than any fact scan. Should return None
+    '''
     epoch = timezone.now()
     timestamp_less = epoch - timedelta(days=1)
     hosts = hosts(host_count=2)
@@ -88,11 +88,11 @@ def test_query_result_empty(hosts, fact_scans):
     assert fact_found is None
 
 
-'''
-Query by fact module other than 'ansible'
-'''
 @pytest.mark.django_db
 def test_by_module(hosts, fact_scans):
+    '''
+    Query by fact module other than 'ansible'
+    '''
     epoch = timezone.now()
     hosts = hosts(host_count=2)
     facts = fact_scans(fact_scans=3, timestamp_epoch=epoch)

awx/main/tests/functional/test_rbac_api.py

@@ -108,7 +108,6 @@ def test_cant_delete_role(delete, admin):
     assert response.status_code == 405
 
 
-
 #
 # /user/<id>/roles
 #
@@ -260,6 +259,7 @@ def test_get_role(get, admin, role):
     assert response.status_code == 200
     assert response.data['id'] == role.id
 
+
 @pytest.mark.django_db
 def test_put_role_405(put, admin, role):
     url = reverse('api:role_detail', args=(role.id,))
@@ -434,7 +434,6 @@ def test_role_children(get, team, admin, role):
     assert response.data['results'][0]['id'] == role.id or response.data['results'][1]['id'] == role.id
 
 
-
 #
 # Generics
 #
@@ -458,6 +457,7 @@ def test_ensure_rbac_fields_are_present(organization, get, admin):
     role = org_role_response.data
     assert role['related']['organization'] == url
 
+
 @pytest.mark.django_db
 def test_ensure_role_summary_is_present(organization, get, user):
     url = reverse('api:organization_detail', args=(organization.id,))

awx/main/tests/functional/test_rbac_inventory.py

@@ -14,6 +14,7 @@ from awx.main.access import (
 )
 from django.apps import apps
 
+
 @pytest.mark.django_db
 def test_custom_inv_script_access(organization, user):
     u = user('user', False)