Cleanup and updated tests

Author: chillaq

splitio/engine/impressions/adapters.py

@@ -130,23 +130,3 @@ def _uniques_formatter(self, uniques):
         :rtype: json
         """
         return [json.dumps({'f': feature, 'ks': list(keys)}) for feature, keys in uniques.items()]
-
-    def _build_counters(self, counters):
-        """
-        Build an impression bulk formatted as the API expects it.
-
-        :param counters: List of impression counters per feature.
-        :type counters: list[splitio.engine.impressions.Counter.CountPerFeature]
-
-        :return: dict with list of impression count dtos
-        :rtype: dict
-        """
-        return json.dumps({
-            'pf': [
-                {
-                    'f': pf_count.feature,
-                    'm': pf_count.timeframe,
-                    'rc': pf_count.count
-                } for pf_count in counters
-            ]
-        })

tests/client/test_factory.py

@@ -100,7 +100,7 @@ def test_redis_client_creation(self, mocker):
         assert adapter == factory._get_storage('impressions')._redis
         assert adapter == factory._get_storage('events')._redis
 
-        assert strict_redis_mock.mock_calls == [mocker.call(
+        assert strict_redis_mock.mock_calls[0] == mocker.call(
             host='some_host',
             port=1234,
             db=1,
@@ -121,8 +121,8 @@ def test_redis_client_creation(self, mocker):
             ssl_certfile='some_cert_file',
             ssl_cert_reqs='some_cert_req',
             ssl_ca_certs='some_ca_cert',
-            max_connections=999
-        )]
+            max_connections=999,
+        )
         assert factory._labels_enabled is False
         assert isinstance(factory._recorder, PipelinedRecorder)
         assert isinstance(factory._recorder._impressions_manager, ImpressionsManager)

tests/engine/test_send_adapters.py

@@ -56,22 +56,6 @@ def test_uniques_formatter(self, mocker):
         for i in range(0,1):
             assert(sorted(ast.literal_eval(sender_adapter._uniques_formatter(uniques)[i])["ks"]) == sorted(formatted[i]["ks"]))
 
-    def test_build_counters(self, mocker):
-        """Test formatting counters dict to json."""
-
-        counters = [
-            Counter.CountPerFeature('f1', 123, 2),
-            Counter.CountPerFeature('f2', 123, 123),
-        ]
-        formatted = [
-            {'f': 'f1', 'm': 123, 'rc': 2},
-            {'f': 'f2', 'm': 123, 'rc': 123},
-        ]
-
-        sender_adapter = RedisSenderAdapter(mocker.Mock())
-        for i in range(0,1):
-            assert(sorted(ast.literal_eval(sender_adapter._build_counters(counters))['pf'][i]) == sorted(formatted[i]))
-
     @mock.patch('splitio.storage.adapters.redis.RedisAdapter.rpush')
     def test_record_unique_keys(self, mocker):
         """Test sending unique keys."""
@@ -85,7 +69,7 @@ def test_record_unique_keys(self, mocker):
 
         assert(mocker.called)
 
-    @mock.patch('splitio.storage.adapters.redis.RedisAdapter.rpush')
+    @mock.patch('splitio.storage.adapters.redis.RedisPipelineAdapter.hincrby')
     def test_flush_counters(self, mocker):
         """Test sending counters."""