fix non-isolated test

Author: mredolatti

splitio/sync/synchronizer.py

@@ -389,4 +389,4 @@ def shutdown(self, blocking):
         :param blocking:flag to wait until tasks are stopped
         :type blocking: bool
         """
-        self.start_periodic_fetching()
+        self.stop_periodic_fetching()

tests/client/test_localhost.py

@@ -1,8 +1,6 @@
 """Localhost mode test module."""
 # pylint: disable=no-self-use,line-too-long,protected-access
-
 import os
-import tempfile
 
 from splitio.client import localhost
 from splitio.sync.split import LocalSplitSynchronizer

tests/integration/test_client_e2e.py

@@ -2,7 +2,7 @@
 #pylint: disable=protected-access,line-too-long,no-self-use
 import json
 import os
-import time
+import threading
 
 from redis import StrictRedis
 
@@ -51,6 +51,12 @@ def setup_method(self):
         impmanager = ImpressionsManager(storages['impressions'].put, ImpressionsMode.DEBUG)
         self.factory = SplitFactory('some_api_key', storages, True, impmanager)  #pylint:disable=attribute-defined-outside-init
 
+    def teardown_method(self):
+        """Shut down the factory."""
+        event = threading.Event()
+        self.factory.destroy(event)
+        event.wait()
+
     def _validate_last_impressions(self, client, *to_validate):
         """Validate the last N impressions are present disregarding the order."""
         imp_storage = client._factory._get_storage('impressions')
@@ -789,7 +795,6 @@ def setup_method(self):
         impmanager = ImpressionsManager(storages['impressions'].put, ImpressionsMode.DEBUG)
         self.factory = SplitFactory('some_api_key', storages, True, impmanager)  #pylint:disable=attribute-defined-outside-init
 
-
 class LocalhostIntegrationTests(object):  #pylint: disable=too-few-public-methods
     """Client & Manager integration tests."""
 
@@ -818,3 +823,11 @@ def test_localhost_e2e(self):
         assert manager.split('other_feature').configs == {}
         assert manager.split('other_feature_2').configs == {}
         assert manager.split('other_feature_3').configs == {}
+        event = threading.Event()
+        factory.destroy(event)
+        event.wait()
+
+        # hack to increase isolation and prevent conflicts with other tests
+        thread = factory._sync_manager._synchronizer._split_tasks.split_task._task._thread
+        if thread is not None and thread.is_alive():
+            thread.join()

tests/storage/test_redis.py

@@ -21,7 +21,7 @@ def test_get_split(self, mocker):
         adapter = mocker.Mock(spec=RedisAdapter)
         adapter.get.return_value = '{"name": "some_split"}'
         from_raw = mocker.Mock()
-        mocker.patch('splitio.models.splits.from_raw', new=from_raw)
+        mocker.patch('splitio.storage.redis.splits.from_raw', new=from_raw)
 
         storage = RedisSplitStorage(adapter)
         storage.get('some_split')
@@ -43,7 +43,7 @@ def test_get_split_with_cache(self, mocker):
         adapter = mocker.Mock(spec=RedisAdapter)
         adapter.get.return_value = '{"name": "some_split"}'
         from_raw = mocker.Mock()
-        mocker.patch('splitio.models.splits.from_raw', new=from_raw)
+        mocker.patch('splitio.storage.redis.splits.from_raw', new=from_raw)
 
         storage = RedisSplitStorage(adapter, True, 1)
         storage.get('some_split')
@@ -62,6 +62,7 @@ def test_get_split_with_cache(self, mocker):
         from_raw.reset_mock()
         adapter.get.return_value = None
 
+        # Still cached
         result = storage.get('some_split')
         assert result is not None
         time.sleep(1)  # wait for expiration
@@ -75,7 +76,7 @@ def test_get_splits_with_cache(self, mocker):
         adapter = mocker.Mock(spec=RedisAdapter)
         storage = RedisSplitStorage(adapter)
         from_raw = mocker.Mock()
-        mocker.patch('splitio.models.splits.from_raw', new=from_raw)
+        mocker.patch('splitio.storage.redis.splits.from_raw', new=from_raw)
 
         adapter.mget.return_value = ['{"name": "split1"}', '{"name": "split2"}', None]
 
@@ -102,7 +103,7 @@ def test_get_all_splits(self, mocker):
         adapter = mocker.Mock(spec=RedisAdapter)
         storage = RedisSplitStorage(adapter)
         from_raw = mocker.Mock()
-        mocker.patch('splitio.models.splits.from_raw', new=from_raw)
+        mocker.patch('splitio.storage.redis.splits.from_raw', new=from_raw)
 
         adapter.keys.return_value = [
             'SPLITIO.split.split1',
@@ -177,7 +178,7 @@ def test_fetch_segment(self, mocker):
         adapter.smembers.return_value = set(["key1", "key2", "key3"])
         adapter.get.return_value = '100'
         from_raw = mocker.Mock()
-        mocker.patch('splitio.models.segments.from_raw', new=from_raw)
+        mocker.patch('splitio.storage.redis.segments.from_raw', new=from_raw)
 
         storage = RedisSegmentStorage(adapter)
         result = storage.get('some_segment')