From 563a0cc2a465a62bae0ce708febc4593927dd557 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Fri, 29 Mar 2019 12:14:40 -0400
Subject: [PATCH] move awx.main.expect to awx.main.isolated

---
 Makefile                                                     | 2 +-
 awx/main/expect/authorized_keys                              | 0
 awx/main/{expect => isolated}/.gitignore                     | 0
 awx/main/{expect => isolated}/__init__.py                    | 0
 awx/main/{expect/isolated_manager.py => isolated/manager.py} | 0
 awx/main/management/commands/test_isolated_connection.py     | 2 +-
 awx/main/tasks.py                                            | 2 +-
 tools/docker-isolated-override.yml                           | 2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 awx/main/expect/authorized_keys
 rename awx/main/{expect => isolated}/.gitignore (100%)
 rename awx/main/{expect => isolated}/__init__.py (100%)
 rename awx/main/{expect/isolated_manager.py => isolated/manager.py} (100%)

diff --git a/Makefile b/Makefile
index 22b3f893f2..109d0be226 100644
--- a/Makefile
+++ b/Makefile
@@ -218,7 +218,7 @@ init:
 	if [ "$(AWX_GROUP_QUEUES)" == "tower,thepentagon" ]; then \
 		$(MANAGEMENT_COMMAND) provision_instance --hostname=isolated; \
 		$(MANAGEMENT_COMMAND) register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \
-		$(MANAGEMENT_COMMAND) generate_isolated_key > /awx_devel/awx/main/expect/authorized_keys; \
+		$(MANAGEMENT_COMMAND) generate_isolated_key > /awx_devel/awx/main/isolated/authorized_keys; \
 	fi;
 
 # Refresh development environment after pulling new code.
diff --git a/awx/main/expect/authorized_keys b/awx/main/expect/authorized_keys
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/awx/main/expect/.gitignore b/awx/main/isolated/.gitignore
similarity index 100%
rename from awx/main/expect/.gitignore
rename to awx/main/isolated/.gitignore
diff --git a/awx/main/expect/__init__.py b/awx/main/isolated/__init__.py
similarity index 100%
rename from awx/main/expect/__init__.py
rename to awx/main/isolated/__init__.py
diff --git a/awx/main/expect/isolated_manager.py b/awx/main/isolated/manager.py
similarity index 100%
rename from awx/main/expect/isolated_manager.py
rename to awx/main/isolated/manager.py
diff --git a/awx/main/management/commands/test_isolated_connection.py b/awx/main/management/commands/test_isolated_connection.py
index 8c8c726926..dd4151e79a 100644
--- a/awx/main/management/commands/test_isolated_connection.py
+++ b/awx/main/management/commands/test_isolated_connection.py
@@ -8,7 +8,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 import ansible_runner
 
-from awx.main.expect.isolated_manager import set_pythonpath
+from awx.main.isolated.manager import set_pythonpath
 
 
 class Command(BaseCommand):
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 50c7509187..4b58a1a253 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -57,7 +57,7 @@ from awx.main.models import (
 from awx.main.constants import ACTIVE_STATES
 from awx.main.exceptions import AwxTaskError
 from awx.main.queue import CallbackQueueDispatcher
-from awx.main.expect import isolated_manager
+from awx.main.isolated import manager as isolated_manager
 from awx.main.dispatch.publish import task
 from awx.main.dispatch import get_local_queuename, reaper
 from awx.main.utils import (get_ssh_version, update_scm_url,
diff --git a/tools/docker-isolated-override.yml b/tools/docker-isolated-override.yml
index ebefef86dd..3093f50029 100644
--- a/tools/docker-isolated-override.yml
+++ b/tools/docker-isolated-override.yml
@@ -12,7 +12,7 @@ services:
     container_name: tools_isolated_1
     hostname: isolated
     volumes:
-      - "../awx/main/expect:/awx_devel"
+      - "../awx/main/isolated:/awx_devel"
       - "../awx/lib:/awx_lib"
       - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
     privileged: true