Merge branch 'master' into 134_multiple_stepImplDir

Author: NivedhaSenthil

getgauge/processor.py

@@ -210,7 +210,10 @@ def _cache_file(request, _response, _socket):
 def update_registry(file, status, content):
     if status == CacheFileRequest.CHANGED or status == CacheFileRequest.OPENED:
         reload_steps(file, content)
-    elif status == CacheFileRequest.CREATED or status == CacheFileRequest.CLOSED:
+    elif status == CacheFileRequest.CREATED:
+        if not registry.is_file_cached(file):
+            _load_from_disk(file)
+    elif status == CacheFileRequest.CLOSED:
         _load_from_disk(file)
     else:
         registry.remove_steps(file)

getgauge/registry.py

@@ -186,6 +186,12 @@ def get_all_methods_in(self, file_name):
             methods = methods + [i for i in infos if i.file_name == file_name]
         return methods + self._get_all_hooks(file_name)
 
+    def is_file_cached(self, file_name):
+        for _, infos in self.__steps_map.items():
+            if any(i.file_name == file_name for i in infos):
+                return True
+        return False
+
     def remove_steps(self, file_name):
         new_map = {}
         for step, infos in self.__steps_map.items():

tests/test_processor.py

@@ -641,6 +641,26 @@ def foo():
 
         self.assertEqual(registry.is_implemented('foo {}'), True)
 
+    def test_Processor_cache_file_with_create_status_when_file_is_cached(self):
+        request = Message()
+        response = Message()
+        self.load_content_steps('''\
+        from getgauge.python import step
+
+        @step('foo <bar>')
+        def foo():
+            pass
+        ''')
+
+        self.assertEqual(registry.is_implemented('foo {}'), True)
+
+        request.cacheFileRequest.filePath = 'foo.py'
+        request.cacheFileRequest.status = CacheFileRequest.CREATED
+        self.fs.create_file('foo.py')
+        processors[Message.CacheFileRequest](request, response, None)
+
+        self.assertEqual(registry.is_implemented('foo {}'), True)
+
     def test_Processor_cache_file_with_closed_status(self):
         request = Message()
         response = Message()

tests/test_registry.py

@@ -334,6 +334,12 @@ def test_Registry_remove_steps_of_a_given_file_with_duplicate_implementations(se
         self.assertTrue(registry.is_implemented('Step 1'))
         self.assertFalse(registry.has_multiple_impls('Step 1'))
 
+    def test_Registry_is_file_cached(self):
+        info = {'text': 'Say <hello> to <getgauge>', 'func': 'func', 'file_name': 'foo.py'}
+        registry.add_step(info['text'], info['func'], info['file_name'])
+
+        self.assertTrue(registry.is_file_cached(info['file_name']))
+
     def test_Registry_add_step_with_empty_arg(self):
         info = {'text': 'Step <>', 'func': 'func', 'file_name': 'foo.py'}