From b19c201975a1cf243d6441fbe7def08466b099e1 Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Wed, 10 Jul 2019 21:16:11 -0500
Subject: [PATCH] Cleanup model ref resetting.

---
 moto/core/models.py                     | 6 +++++-
 moto/sqs/models.py                      | 1 +
 tests/test_core/test_context_manager.py | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/moto/core/models.py b/moto/core/models.py
index 75a5ecce..1b0f2d0d 100644
--- a/moto/core/models.py
+++ b/moto/core/models.py
@@ -466,10 +466,14 @@ class BaseModel(object):
 
 class BaseBackend(object):
 
-    def reset(self):
+    def _reset_model_refs(self):
+        # Remove all references to the models stored
         for service, models in model_data.items():
             for model_name, model in models.items():
                 model.instances = []
+
+    def reset(self):
+        self._reset_model_refs()
         self.__dict__ = {}
         self.__init__()
 
diff --git a/moto/sqs/models.py b/moto/sqs/models.py
index 1404ded7..f2e3ed40 100644
--- a/moto/sqs/models.py
+++ b/moto/sqs/models.py
@@ -379,6 +379,7 @@ class SQSBackend(BaseBackend):
 
     def reset(self):
         region_name = self.region_name
+        self._reset_model_refs()
         self.__dict__ = {}
         self.__init__(region_name)
 
diff --git a/tests/test_core/test_context_manager.py b/tests/test_core/test_context_manager.py
index c5a22558..96d2bec9 100644
--- a/tests/test_core/test_context_manager.py
+++ b/tests/test_core/test_context_manager.py
@@ -2,7 +2,7 @@ import sure  # noqa
 import boto3
 from moto import mock_sqs
 
-def test_reset_api():
+def test_context_manager_returns_mock():
     with mock_sqs() as sqs_mock:
         conn = boto3.client("sqs", region_name='us-west-1')
         conn.create_queue(QueueName="queue1")