review changes 9/2/26

Author: d-w-moore

irods/test/rule_test.py

@@ -1,25 +1,25 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import io
 import json
 import os
-import sys
 import random
-import time
+import sys
 import textwrap
+import time
 import unittest
+from io import open as io_open
+
 from irods.column import Like
-from irods.models import DataObject, RuleExec
 from irods.exception import (
     FAIL_ACTION_ENCOUNTERED_ERR,
     RULE_ENGINE_ERROR,
     UnknowniRODSError,
 )
-import irods.test.helpers as helpers
+from irods.models import DataObject, RuleExec
 from irods.rule import Rule
-from io import open as io_open
-import io
-
+from irods.test import helpers
 
 RE_Plugins_installed_run_condition_args = (
     os.environ.get("PYTHON_RULE_ENGINE_INSTALLED", "*").lower()[:1] == "y",
@@ -439,29 +439,29 @@ def test_rulefile_in_file_like_object_2__336(self):
         self.assertRegex(lines[0], r"\[INTEGER\]\[5\]")
         self.assertRegex(lines[1], r"\[STRING\]\[A String\]")
 
-
-    def test_rule_exec_context(self):
-        if self.sess.server_version < (4, 3):
-            self.skipTest("""RuleExec's "context" attribute not available before 4.3.0""")
-
+    def test_rule_exec_context_column_is_available_via_genquery1__issue_823(self):
         rule_id = -1
 
         try:
-            # Schedule a delayed rule.
-            n_minutes = 15
-            random_int = random.randint(1<<30, (1<<31)-1)
+            # Schedule a delayed rule.  The amount of delay does not matter as only its existence
+            # in the catalog matters and we'll be cancelling it immediately after the test.
+            delay_seconds = 15 * 60
+
+            # Generate a unique number for use in querying the rule.
+            random_int = random.randint(1 << 30, (1 << 31) - 1)  # noqa: S311
             r = Rule(
                 self.sess,
-                body=f'''delay("<PLUSET>{n_minutes}m</PLUSET>") {{ writeLine("serverLog","{random_int}") }}'''
+                body=f'''delay("<PLUSET>{delay_seconds}</PLUSET>") {{ writeLine("serverLog","{random_int}") }}''',
             )
+            # Schedule the delayed rule.
             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]
+            results = list(self.sess.query(RuleExec).filter(Like(RuleExec.name, f'%"{random_int}"%')))
+            rule_id = results[0][RuleExec.id]
 
             # Assert context exists, and is JSON-parsable with a non-null-length result.
-            rule_context = l[0][RuleExec.context]
+            rule_context = results[0][RuleExec.context]
             self.assertGreater(len(json.loads(rule_context)), 0)
         finally:
             # Remove the delayed rule from the queue.