Ensure that a fallback EE is available to be found

for the failing tests.
This commit is contained in:
Jeff Bradberry
2020-12-09 10:28:12 -05:00
committed by Shane McDonald
parent 5f1da2b923
commit 4a0fc3e1af
2 changed files with 7 additions and 1 deletions

View File

@@ -6,7 +6,7 @@ import re
from collections import namedtuple from collections import namedtuple
from awx.main.tasks import RunInventoryUpdate from awx.main.tasks import RunInventoryUpdate
from awx.main.models import InventorySource, Credential, CredentialType, UnifiedJob from awx.main.models import InventorySource, Credential, CredentialType, UnifiedJob, ExecutionEnvironment
from awx.main.constants import CLOUD_PROVIDERS, STANDARD_INVENTORY_UPDATE_ENV from awx.main.constants import CLOUD_PROVIDERS, STANDARD_INVENTORY_UPDATE_ENV
from awx.main.tests import data from awx.main.tests import data
@@ -183,6 +183,8 @@ def create_reference_data(source_dir, env, content):
@pytest.mark.django_db @pytest.mark.django_db
@pytest.mark.parametrize('this_kind', CLOUD_PROVIDERS) @pytest.mark.parametrize('this_kind', CLOUD_PROVIDERS)
def test_inventory_update_injected_content(this_kind, inventory, fake_credential_factory): def test_inventory_update_injected_content(this_kind, inventory, fake_credential_factory):
ExecutionEnvironment.objects.create(name='test EE', managed_by_tower=True)
injector = InventorySource.injectors[this_kind] injector = InventorySource.injectors[this_kind]
if injector.plugin_name is None: if injector.plugin_name is None:
pytest.skip('Use of inventory plugin is not enabled for this source') pytest.skip('Use of inventory plugin is not enabled for this source')

View File

@@ -18,6 +18,7 @@ from awx.main.models import (
AdHocCommand, AdHocCommand,
Credential, Credential,
CredentialType, CredentialType,
ExecutionEnvironment,
Inventory, Inventory,
InventorySource, InventorySource,
InventoryUpdate, InventoryUpdate,
@@ -657,9 +658,12 @@ class TestGenericRun():
assert env['FOO'] == 'BAR' assert env['FOO'] == 'BAR'
@pytest.mark.django_db
class TestAdhocRun(TestJobExecution): class TestAdhocRun(TestJobExecution):
def test_options_jinja_usage(self, adhoc_job, adhoc_update_model_wrapper): def test_options_jinja_usage(self, adhoc_job, adhoc_update_model_wrapper):
ExecutionEnvironment.objects.create(name='test EE', managed_by_tower=True)
adhoc_job.module_args = '{{ ansible_ssh_pass }}' adhoc_job.module_args = '{{ ansible_ssh_pass }}'
adhoc_job.websocket_emit_status = mock.Mock() adhoc_job.websocket_emit_status = mock.Mock()
adhoc_job.send_notification_templates = mock.Mock() adhoc_job.send_notification_templates = mock.Mock()