comments

Author: d-w-moore

irods/test/rule_test.py

@@ -440,23 +440,29 @@ def test_rulefile_in_file_like_object_2__336(self):
 
 
     def test_rule_exec_context(self):
-        rule_id = -1
-        if self.sess.server_version == (4, 2, 1):
+        if self.sess.server_version < (4, 3):
             self.skipTest("""RuleExec's "context" attribute not available before 4.3.0""")
+
+        rule_id = -1
+
         try:
+            # Schedule a delayed rule.
             n_minutes = 15
             random_int = random.randint(1<<30, (1<<31)-1)
             r = Rule(
                 self.sess,
                 body=f'''delay("<PLUSET>{n_minutes}m</PLUSET>") {{writeLine("serverLog","{random_int}")}}'''
             )
             r.execute()
+
+            # Get the delayed rule's ID, needed for cancellation.
             l = list(self.sess.query(RuleExec).filter(Like(RuleExec.name,f'%"{random_int}"%')))
             rule_id = l[0][RuleExec.id]
 
             # Assert context exists, is of string type, and is not empty.
             self.assertGreater(l[0][RuleExec.context], "")
         finally:
+            # Remove the delayed rule from the queue.
             if rule_id >= 0:
                 r.remove_by_id(rule_id)