fix tests

Author: mredolatti

tests/client/test_factory.py

@@ -88,6 +88,7 @@ def _segment_task_init_mock(self, api, storage, split_storage, period, event):
         factory.block_until_ready()
         time.sleep(1) # give a chance for the bg thread to set the ready status
         assert factory.ready
+        factory.destroy()
 
     def test_redis_client_creation(self, mocker):
         """Test that a client with redis storage is created correctly."""
@@ -165,6 +166,7 @@ def test_redis_client_creation(self, mocker):
         factory.block_until_ready()
         time.sleep(1) # give a chance for the bg thread to set the ready status
         assert factory.ready
+        factory.destroy()
 
 
     def test_uwsgi_client_creation(self):
@@ -182,6 +184,7 @@ def test_uwsgi_client_creation(self):
         factory.block_until_ready()
         time.sleep(1) # give a chance for the bg thread to set the ready status
         assert factory.ready
+        factory.destroy()
 
     def test_destroy(self, mocker):
         """Test that tasks are shutdown and data is flushed when destroy is called."""
@@ -366,7 +369,7 @@ def _make_factory_with_apikey(apikey, *_, **__):
         assert _INSTANTIATED_FACTORIES['some_api_key'] == 1
         assert factory_module_logger.warning.mock_calls == []
 
-        get_factory('some_api_key')
+        factory2 = get_factory('some_api_key')
         assert _INSTANTIATED_FACTORIES['some_api_key'] == 2
         assert factory_module_logger.warning.mock_calls == [mocker.call(
             "factory instantiation: You already have %d %s with this API Key. "
@@ -377,7 +380,7 @@ def _make_factory_with_apikey(apikey, *_, **__):
         )]
 
         factory_module_logger.reset_mock()
-        get_factory('some_api_key')
+        factory3 = get_factory('some_api_key')
         assert _INSTANTIATED_FACTORIES['some_api_key'] == 3
         assert factory_module_logger.warning.mock_calls == [mocker.call(
             "factory instantiation: You already have %d %s with this API Key. "
@@ -388,7 +391,7 @@ def _make_factory_with_apikey(apikey, *_, **__):
         )]
 
         factory_module_logger.reset_mock()
-        get_factory('some_other_api_key')
+        factory4 = get_factory('some_other_api_key')
         assert _INSTANTIATED_FACTORIES['some_api_key'] == 3
         assert _INSTANTIATED_FACTORIES['some_other_api_key'] == 1
         assert factory_module_logger.warning.mock_calls == [mocker.call(
@@ -403,3 +406,6 @@ def _make_factory_with_apikey(apikey, *_, **__):
         event.wait()
         assert _INSTANTIATED_FACTORIES['some_other_api_key'] == 1
         assert _INSTANTIATED_FACTORIES['some_api_key'] == 2
+        factory2.destroy()
+        factory3.destroy()
+        factory4.destroy()

tests/client/test_input_validator.py

@@ -1108,9 +1108,13 @@ def test_input_validation_factory(self, mocker):
         ]
 
         logger.reset_mock()
-        assert get_factory(True, config={'uwsgiClient': True}) is not None
+        f = get_factory(True, config={'uwsgiClient': True})
+        assert f is not None
         assert logger.error.mock_calls == []
+        f.destroy()
 
         logger.reset_mock()
-        assert get_factory(True, config={'redisHost': 'some-host'}) is not None
+        f = get_factory(True, config={'redisHost': 'some-host'})
+        assert f is not None
         assert logger.error.mock_calls == []
+        f.destroy()

tests/integration/test_client_e2e.py

@@ -2,6 +2,7 @@
 #pylint: disable=protected-access,line-too-long,no-self-use
 import json
 import os
+import time
 
 from redis import StrictRedis
 
@@ -577,6 +578,7 @@ def test_localhost_e2e(self):
         filename = os.path.join(os.path.dirname(__file__), 'files', 'file2.yaml')
         factory = get_factory('localhost', config={'splitFile': filename})
         factory.block_until_ready()
+        time.sleep(1)
         client = factory.client()
         assert client.get_treatment_with_config('key', 'my_feature') == ('on', '{"desc" : "this applies only to ON treatment"}')
         assert client.get_treatment_with_config('only_key', 'my_feature') == (