still developing 178

Author: bellrichm

bin/user/MQTTSubscribe.py

@@ -2628,8 +2628,8 @@ def __init__(self, engine, config_dict):
         self.cache = RecordCache(self.logger)
 
         # ToDo: Remove when issue 178 is complete
-        # archive_dict = config_dict.get('StdArchive', {})
-        # record_generation = archive_dict.get('record_generation', "none").lower()
+        archive_dict = config_dict.get('StdArchive', {})
+        record_generation = archive_dict.get('record_generation', "none").lower()
 
         if self.binding not in ('loop', 'archive'):
             raise ValueError(MQTTSubscribeService.msgX[29003].format(binding=self.binding))
@@ -2641,8 +2641,8 @@ def __init__(self, engine, config_dict):
             self.bind(weewx.NEW_LOOP_PACKET, self.new_loop_packet)
 
         # ToDo: Remove when issue 178 is complete
-        # if self.subscriber.cached_fields and record_generation != 'software' and self.binding == 'loop':
-        #     raise ValueError(MQTTSubscribeService.msgX[29004].format(record_generation=record_generation))
+        if self.subscriber.cached_fields and record_generation != 'software' and self.binding == 'loop':
+            raise ValueError(MQTTSubscribeService.msgX[29004].format(record_generation=record_generation))
 
     def shutDown(self):  # need to override parent - pylint: disable=invalid-name
         """Run when an engine shutdown is requested."""

bin/user/tests/e2e/test_record_cache.py

@@ -78,7 +78,7 @@ def random_string(length=32):
 
 """ # noqa
 
-# @unittest.skip("Enable when issue 178 is completed.")
+@unittest.skip("Enable when issue 178 is completed.")
 class test_record_cache(unittest.TestCase):
     def test_new_loop_packet(self):
         with mock.patch('user.MQTTSubscribe.RecordCache') as mock_cache:

bin/user/tests/unit/test_MQTTSubscribeService.py

@@ -150,7 +150,7 @@ def test_caching_valid_software_generation(self):
 
                 user.MQTTSubscribe.MQTTSubscribeService(mock_StdEngine, config_dict)
 
-    @unittest.skip("Skipping while developing 178. Remove when released. Run in 'production' code.")
+    # @unittest.skip("Skipping while developing 178. Remove when released. Run in 'production' code.")
     def test_caching_invalid_software_generation(self):
         mock_StdEngine = mock.Mock()
 
@@ -296,7 +296,7 @@ def test_packet_is_in_past(self):
 
                 SUT.shutDown()
 
-    # @unittest.skip("Enable when issue 178 is completed (around line 2456)")
+    @unittest.skip("Enable when issue 178 is completed (around line 2456)")
     def test_cached_field_in_packet(self):
         topic = random_string()
         current_time = int(time.time() + 0.5)