mirror of
https://github.com/ansible/awx.git
synced 2026-02-15 18:20:00 -03:30
Clean up imports and fix some tests
* removed unused imports * adjusted test import to pull correct method
This commit is contained in:
@@ -1,31 +1,17 @@
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import time
|
import time
|
||||||
import traceback
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
from uuid import uuid4
|
|
||||||
|
|
||||||
import collections
|
|
||||||
from multiprocessing import Process
|
from multiprocessing import Process
|
||||||
from multiprocessing import Queue as MPQueue
|
from multiprocessing import Queue as MPQueue
|
||||||
from queue import Full as QueueFull, Empty as QueueEmpty
|
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db import connection as django_connection, connections
|
from django.db import connection as django_connection
|
||||||
from django.core.cache import cache as django_cache
|
from django.core.cache import cache as django_cache
|
||||||
from jinja2 import Template
|
|
||||||
import psutil
|
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger('awx.main.commands.run_callback_receiver')
|
logger = logging.getLogger('awx.main.commands.run_callback_receiver')
|
||||||
|
|
||||||
|
|
||||||
class NoOpResultQueue(object):
|
|
||||||
def put(self, item):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class PoolWorker(object):
|
class PoolWorker(object):
|
||||||
"""
|
"""
|
||||||
Used to track a worker child process and its pending and finished messages.
|
Used to track a worker child process and its pending and finished messages.
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ import time
|
|||||||
from queue import Empty as QueueEmpty
|
from queue import Empty as QueueEmpty
|
||||||
|
|
||||||
from django import db
|
from django import db
|
||||||
from django.conf import settings
|
|
||||||
import redis.exceptions
|
|
||||||
|
|
||||||
|
|
||||||
from awx.main.utils.redis import get_redis_client
|
from awx.main.utils.redis import get_redis_client
|
||||||
|
|||||||
@@ -3,14 +3,8 @@
|
|||||||
import logging
|
import logging
|
||||||
import logging.config
|
import logging.config
|
||||||
import yaml
|
import yaml
|
||||||
import copy
|
|
||||||
|
|
||||||
import redis
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.db import connection
|
|
||||||
from django.core.management.base import BaseCommand, CommandError
|
from django.core.management.base import BaseCommand, CommandError
|
||||||
from django.core.cache import cache as django_cache
|
|
||||||
|
|
||||||
from dispatcherd.factories import get_control_from_settings
|
from dispatcherd.factories import get_control_from_settings
|
||||||
from dispatcherd import run_service
|
from dispatcherd import run_service
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ from django.utils.translation import gettext_lazy as _
|
|||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
from django.utils.encoding import smart_str
|
from django.utils.encoding import smart_str
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from flags.state import flag_enabled
|
|
||||||
|
|
||||||
# REST Framework
|
# REST Framework
|
||||||
from rest_framework.exceptions import ParseError
|
from rest_framework.exceptions import ParseError
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import shutil
|
|||||||
import time
|
import time
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
from contextlib import redirect_stdout
|
from contextlib import redirect_stdout
|
||||||
from datetime import datetime
|
|
||||||
from packaging.version import Version
|
from packaging.version import Version
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
|
|
||||||
@@ -76,7 +75,6 @@ from awx.main.tasks.host_indirect import save_indirect_host_entries
|
|||||||
from awx.main.tasks.receptor import administrative_workunit_reaper, get_receptor_ctl, worker_cleanup, worker_info, write_receptor_config
|
from awx.main.tasks.receptor import administrative_workunit_reaper, get_receptor_ctl, worker_cleanup, worker_info, write_receptor_config
|
||||||
from awx.main.utils.common import ignore_inventory_computed_fields, ignore_inventory_group_removal
|
from awx.main.utils.common import ignore_inventory_computed_fields, ignore_inventory_group_removal
|
||||||
from awx.main.utils.reload import stop_local_services
|
from awx.main.utils.reload import stop_local_services
|
||||||
from dispatcherd.publish import task
|
|
||||||
|
|
||||||
logger = logging.getLogger('awx.main.tasks.system')
|
logger = logging.getLogger('awx.main.tasks.system')
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import pytest
|
|||||||
# AWX
|
# AWX
|
||||||
from awx.main.ha import is_ha_environment
|
from awx.main.ha import is_ha_environment
|
||||||
from awx.main.models.ha import Instance
|
from awx.main.models.ha import Instance
|
||||||
from awx.main.dispatch.pool import get_auto_max_workers
|
from awx.main.utils.common import get_auto_max_workers
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
from django.test.utils import override_settings
|
from django.test.utils import override_settings
|
||||||
|
|||||||
Reference in New Issue
Block a user