make sure it's OK to call remove_lock on a lock that's no longer there

Author: boegel

easybuild/tools/filetools.py

@@ -1532,7 +1532,8 @@ def remove_lock(lock_name):
     lock_path = det_lock_path(lock_name)
     _log.info("Removing lock %s...", lock_path)
     remove_dir(lock_path)
-    global_lock_names.remove(lock_name)
+    if lock_name in global_lock_names:
+        global_lock_names.remove(lock_name)
     _log.info("Lock removed: %s", lock_path)
 
 

test/framework/filetools.py

@@ -2431,6 +2431,9 @@ def test_locks(self):
         ft.remove_lock(lock_name)
         self.assertFalse(os.path.exists(lock_path))
 
+        # no harm done if remove_lock is called if lock is already gone
+        ft.remove_lock(lock_name)
+
         # check_lock just returns again after lock is removed
         ft.check_lock(lock_name)