From 308712841cb1e9021fce9615d035017421d953b4 Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Tue, 9 Jul 2019 20:31:43 -0500
Subject: [PATCH] Have context manager return mock.

---
 moto/core/models.py                     |  1 +
 tests/test_core/test_context_manager.py | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 tests/test_core/test_context_manager.py

diff --git a/moto/core/models.py b/moto/core/models.py
index 9fe1e96bd..75a5ecce1 100644
--- a/moto/core/models.py
+++ b/moto/core/models.py
@@ -52,6 +52,7 @@ class BaseMockAWS(object):
 
     def __enter__(self):
         self.start()
+        return self
 
     def __exit__(self, *args):
         self.stop()
diff --git a/tests/test_core/test_context_manager.py b/tests/test_core/test_context_manager.py
new file mode 100644
index 000000000..c5a22558f
--- /dev/null
+++ b/tests/test_core/test_context_manager.py
@@ -0,0 +1,10 @@
+import sure  # noqa
+import boto3
+from moto import mock_sqs
+
+def test_reset_api():
+    with mock_sqs() as sqs_mock:
+        conn = boto3.client("sqs", region_name='us-west-1')
+        conn.create_queue(QueueName="queue1")
+
+        list(sqs_mock.backends['us-west-1'].queues.keys()).should.equal(['queue1'])