Merge pull request #6 from iferguson90/master

Testing environment variables

tests/__init__.py

@@ -34,11 +34,8 @@ def this_dir():
 def procfile_path():
     return os.path.join(this_dir(), 'scripts', 'Procfile')
 
-def env_path():
-    return os.path.join(this_dir(), 'scripts', 'environment.txt')
-
 def service_command_line():
-    return ['honcho', '-f', procfile_path(), '-e', env_path(), 'start',
+    return ['honcho', '-f', procfile_path(), 'start',
             '-c', 'worker=%s' % NUM_WORKERS]
 
 

tests/api/v1/base.py

@@ -54,8 +54,8 @@ class BaseAPITest(unittest.TestCase):
     __metaclass__ = abc.ABCMeta
 
     def setUp(self):
-        self.api_host = os.environ.setdefault('PTERO_FORK_HOST', 'localhost')
-        self.api_port = os.environ.setdefault('PTERO_FORK_PORT', '5200')
+        self.api_host = os.environ['PTERO_FORK_HOST']
+        self.api_port = os.environ['PTERO_FORK_PORT']
 
     def create_callback_server(self, response_codes):
         server = CallbackServer(response_codes)

tests/scripts/Procfile

@@ -1,4 +1,4 @@
-rabbit: RABBITMQ_LOG_BASE=$PWD/$RABBITMQ_LOG_BASE RABBITMQ_MNESIA_BASE=$PWD/$RABBITMQ_MNESIA_BASE rabbitmq-server
-redis: redis-server --port $REDIS_PORT
-web: python tests/scripts/web_wrapper.py
-worker: coverage run $(which celery) worker -n shell_worker.%h.$PORT --pool=eventlet --concurrency 1 -A ptero_shell_command_fork.implementation.celery_app
+rabbit: RABBITMQ_LOG_BASE=$PWD/$PTERO_FORK_RABBITMQ_LOG_BASE RABBITMQ_MNESIA_BASE=$PWD/$PTERO_FORK_RABBITMQ_MNESIA_BASE RABBITMQ_NODENAME=$PTERO_FORK_RABBITMQ_NODENAME RABBITMQ_NODE_PORT=$PTERO_FORK_RABBITMQ_NODE_PORT rabbitmq-server
+redis: redis-server --port $PTERO_FORK_REDIS_PORT
+web: CELERY_BROKER_URL=$PTERO_FORK_CELERY_BROKER_URL CELERY_RESULT_BACKEND=$PTERO_FORK_CELERY_RESULT_BACKEND python tests/scripts/web_wrapper.py
+worker: CELERY_BROKER_URL=$PTERO_FORK_CELERY_BROKER_URL CELERY_RESULT_BACKEND=$PTERO_FORK_CELERY_RESULT_BACKEND coverage run $(which celery) worker -n shell_worker.%h.$PORT --pool=eventlet --concurrency 1 -A ptero_shell_command_fork.implementation.celery_app

tests/scripts/web_service.py

@@ -1,8 +1,8 @@
 from ptero_shell_command_fork.api.wsgi import app
 import os
 
-port = int(os.environ.get('PTERO_FORK_PORT', '5200'))
-host = os.environ.get('PTERO_FORK_HOST', 'localhost')
+port = int(os.environ['PTERO_FORK_PORT'])
+host = os.environ['PTERO_FORK_HOST']
 
 
 app.run(host=host, port=port, debug=False, use_reloader=False)

tox.ini

@@ -8,6 +8,15 @@ whitelist_externals =
     rm
 setenv =
     PYTHONPATH=.
+    PTERO_FORK_CELERY_BROKER_URL=amqp://localhost:5999
+    PTERO_FORK_CELERY_RESULT_BACKEND=redis://localhost:5998
+    PTERO_FORK_REDIS_PORT=5998
+    PTERO_FORK_RABBITMQ_LOG_BASE=var/log
+    PTERO_FORK_RABBITMQ_MNESIA_BASE=var/rabbitmq-data
+    PTERO_FORK_RABBITMQ_NODENAME=ptero-fork-rabbitmq
+    PTERO_FORK_RABBITMQ_NODE_PORT=5999
+    PTERO_FORK_HOST=localhost
+    PTERO_FORK_PORT=5200
 commands =
     rm -rf {toxinidir}/var
     coverage combine