From 6c9b81765be7868d766d8f19477b736faf0ae2cd Mon Sep 17 00:00:00 2001 From: cameron-r Date: Tue, 21 Oct 2014 12:47:01 -0500 Subject: [PATCH] Cam & Ed | Change name of TEST environment variable to MOCK_EC2 --- ec2driver_config.py | 2 +- tests/setup_moto.sh | 4 ++-- tests/shutdown_moto.sh | 4 ++-- tests/test_ec2driver.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ec2driver_config.py b/ec2driver_config.py index 4fc24f5..b8e4186 100644 --- a/ec2driver_config.py +++ b/ec2driver_config.py @@ -1,6 +1,6 @@ import os -if os.environ.get('TEST'): +if os.environ.get('MOCK_EC2'): print "test environment" from ec2driver_test_config import * else: diff --git a/tests/setup_moto.sh b/tests/setup_moto.sh index 5c6075a..4c7afd5 100755 --- a/tests/setup_moto.sh +++ b/tests/setup_moto.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash -echo "Setting environment variable TEST=True" -export TEST=True +echo "Setting environment variable MOCK_EC2=True" +export MOCK_EC2=True echo "Restarting moto" ps aux | grep moto_server | grep -v grep | awk '{print $2}' | xargs kill -9 diff --git a/tests/shutdown_moto.sh b/tests/shutdown_moto.sh index 3df2178..a953e38 100755 --- a/tests/shutdown_moto.sh +++ b/tests/shutdown_moto.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash -echo "Unsetting environment variable TEST" -unset TEST +echo "Unsetting environment variable MOCK_EC2" +unset MOCK_EC2 echo "Killing moto" ps aux | grep moto_server | grep -v grep | awk '{print $2}' | xargs kill -9 diff --git a/tests/test_ec2driver.py b/tests/test_ec2driver.py index 6954900..e688920 100644 --- a/tests/test_ec2driver.py +++ b/tests/test_ec2driver.py @@ -11,7 +11,7 @@ from ..ec2driver_config import * def sleep_if_ec2_not_mocked(seconds): - if not os.environ.get('TEST'): + if not os.environ.get('MOCK_EC2'): time.sleep(seconds)