Merge pull request #345 from chrismeyersfsu/fix-centos_6.5

unittest works on centos 6.5

awx/main/management/commands/workload_generator.py

@@ -18,6 +18,7 @@ import mongoengine
 # awx
 from awx.fact.models.fact import * # noqa
 from awx.main.models import * # noqa
+from awx.main.utils import timedelta_total_seconds
 
 TEST_FACT_ANSIBLE = {
     "ansible_swapfree_mb" : 4092,
@@ -198,12 +199,6 @@ EXPERIMENT_DEFAULT = {
     ]
 }
 
-# damn you python 2.6
-def timedelta_total_seconds(timedelta):
-    return (
-        timedelta.microseconds + 0.0 +
-        (timedelta.seconds + timedelta.days * 24 * 3600) * 10 ** 6) / 10 ** 6
-
 class Experiment(object):
     def __init__(self, exp, fact_fixtures, raw_db, mongoengine_db):
         self.db = raw_db

awx/main/tests/base.py

@@ -56,8 +56,12 @@ class QueueTestMixin(object):
 
     def start_redis(self):
         if not getattr(self, 'redis_process', None):
-            self.redis_process = Popen('redis-server --port 16379 > /dev/null',
-                                       shell=True, executable='/bin/bash')
+            # Centos 6.5 redis is runnable by non-root user but is not in a normal users path by default
+            env = dict(os.environ)
+            env['PATH'] = '%s:/usr/sbin/' % env['PATH']
+            self.redis_process = Popen('echo "port 16379" | redis-server - > /dev/null',
+                                       shell=True, executable='/bin/bash',
+                                       env=env)
 
     def stop_redis(self):
         if getattr(self, 'redis_process', None):

awx/main/tests/commands/commands_monolithic.py

@@ -11,7 +11,7 @@ import sys
 import tempfile
 import time
 import urlparse
-import unittest
+import unittest2 as unittest
 
 # Django
 import django
@@ -26,9 +26,6 @@ from django.test.utils import override_settings
 from awx.main.models import * # noqa
 from awx.main.tests.base import BaseTest, BaseLiveServerTest
 
-if not hasattr(unittest, 'skipIf'):
-    import unittest2 as unittest
-
 __all__ = ['CreateDefaultOrgTest', 'DumpDataTest', 'CleanupDeletedTest',
            'CleanupJobsTest', 'CleanupActivityStreamTest',
            'InventoryImportTest']

awx/main/tests/commands/run_fact_cache_receiver.py

@@ -5,7 +5,7 @@
 import time
 from datetime import datetime
 import mock
-import unittest
+import unittest2 as unittest
 from copy import deepcopy
 from mock import MagicMock
 

awx/main/tests/fact/fact_api.py

@@ -2,7 +2,7 @@
 # All Rights Reserved
 
 # Python
-import unittest
+import unittest2 as unittest
 
 # Django
 from django.core.urlresolvers import reverse

awx/main/tests/tasks.py

@@ -8,7 +8,7 @@ import os
 import shutil
 import subprocess
 import tempfile
-import unittest
+import unittest2 as unittest
 
 # Django
 from django.conf import settings

awx/main/utils.py

@@ -511,3 +511,11 @@ def timestamp_apiformat(timestamp):
     if timestamp.endswith('+00:00'):
         timestamp = timestamp[:-6] + 'Z'
     return timestamp
+
+# damn you python 2.6
+def timedelta_total_seconds(timedelta):
+    return (
+        timedelta.microseconds + 0.0 +
+        (timedelta.seconds + timedelta.days * 24 * 3600) * 10 ** 6) / 10 ** 6
+
+