use env var to maintain state, test for client error

Rio Goodman · Rio Goodman · commit 82b51a528677 · 2017-01-04T15:21:58.000-08:00
diff --git a/localstack/constants.py b/localstack/constants.py
@@ -42,7 +42,8 @@
 TEST_APIGATEWAY_URL = 'http://%s:%s' % (LOCALHOST, DEFAULT_PORT_APIGATEWAY)
 
 # For testing
-KINESIS_RETURN_ERRORS = False
+if 'KINESIS_RETURN_ERRORS' not in os.environ:
+    os.environ['KINESIS_RETURN_ERRORS'] = 'False'
 
 # AWS user account ID used for tests
 TEST_AWS_ACCOUNT_ID = '123456789'
diff --git a/localstack/mock/infra.py b/localstack/mock/infra.py
@@ -368,7 +368,7 @@ def update_apigateway(method, path, data, headers, response=None, return_forward
 
 def update_kinesis(method, path, data, headers, response=None, return_forward_info=False):
     if return_forward_info:
-        if KINESIS_RETURN_ERRORS:
+        if os.environ['KINESIS_RETURN_ERRORS'] == 'True':
             return 500
         else:
             return True
diff --git a/tests/test_kinesis_errors.py b/tests/test_kinesis_errors.py
@@ -1,5 +1,7 @@
 import __init__
 import boto3
+from nose.tools import assert_raises
+from botocore.exceptions import ClientError
 from localstack.constants import *
 from localstack.utils.common import *
 from localstack.mock import infra
@@ -26,9 +28,9 @@ def start_test(env=ENV_DEV):
             }
         ]
 
-        KINESIS_RETURN_ERRORS = True
-        kinesis.put_records(StreamName='test-stream-1', Records=records)
-        KINESIS_RETURN_ERRORS = False
+        os.environ['KINESIS_RETURN_ERRORS'] = 'True'
+        assert_raises(ClientError, kinesis.put_records, StreamName='test-stream-1', Records=records)
+        os.environ['KINESIS_RETURN_ERRORS'] = 'False'
 
     except KeyboardInterrupt, e:
         infra.KILLED = True
