remove special scan job logic

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

@@ -76,14 +76,6 @@ def job_template_prompts_null(project):
     )
 
 
-@pytest.fixture
-def bad_scan_JT(job_template_prompts):
-    job_template = job_template_prompts(True)
-    job_template.job_type = 'scan'
-    job_template.save()
-    return job_template
-
-
 # End of setup, tests start here
 @pytest.mark.django_db
 @pytest.mark.job_runtime_vars
@@ -259,18 +251,6 @@ def test_job_block_scan_job_type_change(job_template_prompts, post, admin_user):
     assert 'job_type' in response.data
 
 
-@pytest.mark.django_db
-@pytest.mark.job_runtime_vars
-def test_job_block_scan_job_inv_change(mocker, bad_scan_JT, runtime_data, post, admin_user):
-    # Assure that giving a new inventory for a scan job blocks the launch
-    with mocker.patch('awx.main.access.BaseAccess.check_license'):
-        response = post(reverse('api:job_template_launch', kwargs={'pk': bad_scan_JT.pk}),
-                        dict(inventory=runtime_data['inventory']), admin_user,
-                        expect=400)
-
-    assert 'inventory' in response.data
-
-
 @pytest.mark.django_db
 def test_job_launch_JT_with_validation(machine_credential, deploy_jobtemplate):
     deploy_jobtemplate.extra_vars = '{"job_template_var": 3}'

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

@@ -1,7 +1,7 @@
 import pytest
 
 # AWX
-from awx.api.serializers import JobTemplateSerializer, JobLaunchSerializer
+from awx.api.serializers import JobTemplateSerializer
 from awx.api.versioning import reverse
 from awx.main.models.jobs import Job
 from awx.main.migrations import _save_password_keys as save_password_keys
@@ -387,7 +387,6 @@ def test_edit_nonsenstive(patch, job_template_factory, alice):
         'ask_inventory_on_launch':True,
         'ask_credential_on_launch': True,
     }, alice, expect=200)
-    print(res.data)
     assert res.data['name'] == 'updated'
 
 
@@ -430,48 +429,6 @@ def test_jt_admin_copy_edit_functional(jt_copy_edit, rando, get, post):
     assert post_response.status_code == 403
 
 
-@pytest.mark.django_db
-def test_scan_jt_no_inventory(job_template_factory):
-    # A user should be able to create a scan job without a project, but an inventory is required
-    objects = job_template_factory('jt',
-                                   credential='c',
-                                   job_type="scan",
-                                   project='p',
-                                   inventory='i',
-                                   organization='o')
-    serializer = JobTemplateSerializer(data={"name": "Test", "job_type": "scan",
-                                             "project": None, "inventory": objects.inventory.pk})
-    assert serializer.is_valid()
-    serializer = JobTemplateSerializer(data={"name": "Test", "job_type": "scan",
-                                             "project": None, "inventory": None})
-    assert not serializer.is_valid()
-    assert "inventory" in serializer.errors
-    serializer = JobTemplateSerializer(data={"name": "Test", "job_type": "scan",
-                                             "project": None, "inventory": None,
-                                             "ask_inventory_on_launch": True})
-    assert not serializer.is_valid()
-    assert "inventory" in serializer.errors
-
-    # A user shouldn't be able to launch a scan job template which is missing an inventory
-    obj_jt = objects.job_template
-    obj_jt.inventory = None
-    serializer = JobLaunchSerializer(instance=obj_jt,
-                                     context={'obj': obj_jt,
-                                              "data": {}},
-                                     data={})
-    assert not serializer.is_valid()
-    assert 'inventory' in serializer.errors
-
-
-@pytest.mark.django_db
-def test_scan_jt_surveys(inventory):
-    serializer = JobTemplateSerializer(data={"name": "Test", "job_type": "scan",
-                                             "project": None, "inventory": inventory.pk,
-                                             "survey_enabled": True})
-    assert not serializer.is_valid()
-    assert "survey_enabled" in serializer.errors
-
-
 @pytest.mark.django_db
 def test_launch_with_pending_deletion_inventory(get, post, organization_factory,
                                                 job_template_factory, machine_credential,
@@ -641,9 +598,6 @@ def test_jt_without_project(inventory):
     serializer = JobTemplateSerializer(data=data)
     assert not serializer.is_valid()
     assert "project" in serializer.errors
-    data["job_type"] = "scan"
-    serializer = JobTemplateSerializer(data=data)
-    assert serializer.is_valid()
 
 
 @pytest.mark.django_db

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

@@ -163,12 +163,7 @@ def test_two_organizations(resourced_organization, organizations, user, get):
 @pytest.mark.django_db
 def test_scan_JT_counted(resourced_organization, user, get):
     admin_user = user('admin', True)
-    # Add a scan job template to the org
-    resourced_organization.projects.all()[0].jobtemplates.create(
-        job_type='scan', inventory=resourced_organization.inventories.all()[0],
-        name='scan-job-template')
     counts_dict = COUNTS_PRIMES
-    counts_dict['job_templates'] += 1
 
     # Test list view
     list_response = get(reverse('api:organization_list'), admin_user)
@@ -184,7 +179,7 @@ def test_scan_JT_counted(resourced_organization, user, get):
 @pytest.mark.django_db
 def test_JT_not_double_counted(resourced_organization, user, get):
     admin_user = user('admin', True)
-    # Add a scan job template to the org
+    # Add a run job template to the org
     resourced_organization.projects.all()[0].jobtemplates.create(
         job_type='run',
         inventory=resourced_organization.inventories.all()[0],