diff options
| author | Bill Nottingham <notting@splat.cc> | 2018-02-26 20:55:13 +0100 |
|---|---|---|
| committer | Bill Nottingham <notting@splat.cc> | 2018-02-26 20:55:13 +0100 |
| commit | 9c722cba224ad5bf0710b31cfded5b95e12b1c88 (patch) | |
| tree | e25686f674ee7ece7cafb8614462f97df229a5a3 | |
| parent | Merge pull request #904 from ansible/oauth_n_session (diff) | |
| download | awx-9c722cba224ad5bf0710b31cfded5b95e12b1c88.tar.xz awx-9c722cba224ad5bf0710b31cfded5b95e12b1c88.zip | |
Remove some obsolete code.
| -rw-r--r-- | awx/api/filters.py | 7 | ||||
| -rw-r--r-- | awx/settings/local_settings.py.docker_compose | 2 | ||||
| -rw-r--r-- | awx/settings/local_settings.py.example | 2 | ||||
| -rw-r--r-- | pytest.ini | 1 | ||||
| -rw-r--r-- | tox.ini | 1 |
5 files changed, 0 insertions, 13 deletions
diff --git a/awx/api/filters.py b/awx/api/filters.py index 238f9c7dcc..680f6bc3e8 100644 --- a/awx/api/filters.py +++ b/awx/api/filters.py @@ -27,13 +27,6 @@ from awx.main.models.credential import CredentialType from awx.main.models.rbac import RoleAncestorEntry -class MongoFilterBackend(BaseFilterBackend): - - # FIX: Note that MongoEngine can't use the filter backends from DRF - def filter_queryset(self, request, queryset, view): - return queryset - - class V1CredentialFilterBackend(BaseFilterBackend): ''' For /api/v1/ requests, filter out v2 (custom) credentials diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose index 84592c21bd..d426e9b5a2 100644 --- a/awx/settings/local_settings.py.docker_compose +++ b/awx/settings/local_settings.py.docker_compose @@ -78,8 +78,6 @@ if is_testing(sys.argv): } } - MONGO_DB = 'system_tracking_test' - # Celery AMQP configuration. CELERY_BROKER_URL = "amqp://{}:{}@{}/{}".format(os.environ.get("RABBITMQ_USER"), os.environ.get("RABBITMQ_PASS"), diff --git a/awx/settings/local_settings.py.example b/awx/settings/local_settings.py.example index ecf43f2ced..ffafd7216f 100644 --- a/awx/settings/local_settings.py.example +++ b/awx/settings/local_settings.py.example @@ -45,8 +45,6 @@ if is_testing(sys.argv): } } - MONGO_DB = 'system_tracking_test' - # Celery AMQP configuration. BROKER_URL = 'amqp://guest:guest@localhost:5672' diff --git a/pytest.ini b/pytest.ini index 4884ec4897..91e4c9a95a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -7,6 +7,5 @@ addopts = --reuse-db --nomigrations --tb=native markers = ac: access control test license_feature: ensure license features are accessible or not depending on license - mongo_db: drop mongodb test database before test runs survey: tests related to survey feature inventory_import: tests of code used by inventory import command @@ -75,4 +75,3 @@ addopts = --reuse-db --nomigrations --tb=native markers = ac: access control test license_feature: ensure license features are accessible or not depending on license - mongo_db: drop mongodb test database before test runs |