Merge branch 'system_tracking_api'

Conflicts:
	awx/fact/tests/models/fact/fact_transform.py
	awx/fact/tests/models/fact/fact_transform_pymongo.py
	awx/main/tests/commands/run_fact_cache_receiver.py
This commit is contained in:
Chris Meyers
2015-05-11 10:17:52 -04:00
33 changed files with 1703 additions and 303 deletions

View File

@@ -25,9 +25,6 @@ from django.contrib.auth.models import User
from django.test.client import Client
from django.test.utils import override_settings
# MongoEngine
from mongoengine.connection import get_db, ConnectionError
# AWX
from awx.main.models import * # noqa
from awx.main.backend import LDAPSettings
@@ -43,15 +40,6 @@ TEST_PLAYBOOK = '''- hosts: mygroup
command: test 1 = 1
'''
class MongoDBRequired(django.test.TestCase):
def setUp(self):
# Drop mongo database
try:
self.db = get_db()
self.db.connection.drop_database(settings.MONGO_DB)
except ConnectionError:
self.skipTest('MongoDB connection failed')
class QueueTestMixin(object):
def start_queue(self):
self.start_redis()