Skip to content

Commit

Permalink
[irods/irods_rule_engine_plugin_python#183] PREP tests: update refere…
Browse files Browse the repository at this point in the history
…nces to global_vars
SwooshyCueb authored and alanking committed Jan 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 82ec95d commit 0d4c2be
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions scripts/irods/test/test_prep_genquery_iterator.py
Original file line number Diff line number Diff line change
@@ -356,7 +356,7 @@ def my_rule_256(rule_args, callback, rei):
rule_file = f.name
print(dedent('''\
def main(rule_args,callback,rei):
TestCollection = global_vars['*testcollection'][1:-1]
TestCollection = irods_rule_vars['*testcollection'][1:-1]
retval = callback.my_rule_256(TestCollection);
result = retval['arguments'][0]
callback.writeLine("stdout", "multiples of 256 test: {}".format(result))
@@ -451,7 +451,7 @@ def my_rule_256_nonnested(rule_args, callback, rei):
rule_file = f.name
print(dedent('''\
def main(rule_args,callback,rei):
TestCollection = global_vars['*testcollection'][1:-1]
TestCollection = irods_rule_vars['*testcollection'][1:-1]
retval = callback.my_rule_256_nonnested(TestCollection);
result = retval['arguments'][0]
callback.writeLine("stdout", "nonnested repeats test: {}".format(result))
@@ -514,7 +514,7 @@ def my_rule_256_nested(rule_args, callback, rei):
rule_file = f.name
print(dedent('''\
def main(rule_args,callback,rei):
TestCollection = global_vars['*testcollection'][1:-1]
TestCollection = irods_rule_vars['*testcollection'][1:-1]
retval = callback.my_rule_256_nested(TestCollection);
result = retval['arguments'][0]
# import os
@@ -573,7 +573,7 @@ def test_nested_paged_iterators(self):
rule_file = f.name
print(dedent('''\
def main(rule_args,callback,rei):
collect = global_vars['*testcollection'][1:-1]
collect = irods_rule_vars['*testcollection'][1:-1]
from genquery import row_iterator, paged_iterator, AS_LIST
condString1 = "COLL_NAME = '" + collect + "' and {cond1}"
@@ -695,10 +695,10 @@ def create_py_rulefile_and_tst(self,N):
rule_string = dedent('''\
def main(rule_args,callback,rei):
a = "%s/%%" # collection plus Sql match pattern
b = global_vars['*rpi'][1:-1] # rows_per_iter
b = irods_rule_vars['*rpi'][1:-1] # rows_per_iter
c = "" # empty string (no verbose log dump)
rpi = global_vars['*rpi'][1:-1]
nobj = global_vars['*nobj'][1:-1]
rpi = irods_rule_vars['*rpi'][1:-1]
nobj = irods_rule_vars['*nobj'][1:-1]
#callback.writeLine('serverLog', '*nobj = {}'.format(nobj))
predicted = validate_output( nobj , rpi , "" )
if b == "0": b = ""
10 changes: 5 additions & 5 deletions scripts/irods/test/test_resource_types.py
Original file line number Diff line number Diff line change
@@ -2191,7 +2191,7 @@ def test_msiDataObjRsync__2976(self):
'''),
'irods_rule_engine_plugin-python': textwrap.dedent('''
def main(rule_args, callback, rei):
out_dict = callback.msiDataObjRsync(global_vars['*SourceFile'][1:-1], 'IRODS_TO_IRODS', global_vars['*Resource'][1:-1], global_vars['*DestFile'][1:-1], 0)
out_dict = callback.msiDataObjRsync(irods_rule_vars['*SourceFile'][1:-1], 'IRODS_TO_IRODS', global_vars['*Resource'][1:-1], global_vars['*DestFile'][1:-1], 0)
if not out_dict['status']:
callback.writeLine('stdout', 'ERROR: ' + str(out_dict['code']))
@@ -2253,7 +2253,7 @@ def test_msiCollRsync__2976(self):
'''),
'irods_rule_engine_plugin-python': textwrap.dedent('''
def main(rule_args, callback, rei):
out_dict = callback.msiCollRsync(global_vars['*SourceColl'][1:-1], global_vars['*DestColl'][1:-1], global_vars['*Resource'][1:-1], 'IRODS_TO_IRODS', 0)
out_dict = callback.msiCollRsync(irods_rule_vars['*SourceColl'][1:-1], global_vars['*DestColl'][1:-1], global_vars['*Resource'][1:-1], 'IRODS_TO_IRODS', 0)
if not out_dict['status']:
callback.writeLine('stdout', 'ERROR: ' + str(out_dict['code']))
@@ -2322,7 +2322,7 @@ def test_msiDataObjUnlink__2983(self):
'''),
'irods_rule_engine_plugin-python': textwrap.dedent('''
def main(rule_args, callback, rei):
out_dict = callback.msiDataObjUnlink('objPath=' + global_vars['*SourceFile'][1:-1] + '++++unreg=', 0)
out_dict = callback.msiDataObjUnlink('objPath=' + irods_rule_vars['*SourceFile'][1:-1] + '++++unreg=', 0)
if not out_dict['status']:
callback.writeLine('stdout', 'ERROR: ' + str(out_dict['code']))
@@ -2366,7 +2366,7 @@ def test_msiDataObjRepl_as_admin__2988(self):
'''),
'irods_rule_engine_plugin-python': textwrap.dedent('''
def main(rule_args, callback, rei):
out_dict = callback.msiDataObjRepl(global_vars['*SourceFile'][1:-1], 'destRescName=' + global_vars['*Resource'][1:-1] + '++++irodsAdmin=', 0)
out_dict = callback.msiDataObjRepl(irods_rule_vars['*SourceFile'][1:-1], 'destRescName=' + global_vars['*Resource'][1:-1] + '++++irodsAdmin=', 0)
if not out_dict['status']:
callback.writeLine('stdout', 'ERROR: ' + str(out_dict['code']))
@@ -2420,7 +2420,7 @@ def test_msisync_to_archive__2962_and_6029(self):
'''),
'irods_rule_engine_plugin-python': textwrap.dedent('''
def main(rule_args, callback, rei):
out_dict = callback.msisync_to_archive(global_vars['*RescHier'][1:-1], global_vars['*PhysicalPath'][1:-1], global_vars['*LogicalPath'][1:-1])
out_dict = callback.msisync_to_archive(irods_rule_vars['*RescHier'][1:-1], global_vars['*PhysicalPath'][1:-1], global_vars['*LogicalPath'][1:-1])
if not out_dict['status']:
callback.writeLine('stdout', 'ERROR: ' + str(out_dict['code']))
2 changes: 1 addition & 1 deletion scripts/irods/test/test_rulebase.py
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ def test_msiDataObjWrite__2795(self):
'''),
'irods_rule_engine_plugin-python': textwrap.dedent(f'''
def main(rule_args, callback, rei):
out_dict = callback.msiDataObjCreate(global_vars['*TEST_ROOT'][1:-1] + '/' + '{filename}', 'null', 0)
out_dict = callback.msiDataObjCreate(irods_rule_vars['*TEST_ROOT'][1:-1] + '/' + '{filename}', 'null', 0)
file_desc = out_dict['arguments'][2]
out_dict = callback.msiDataObjWrite(file_desc, 'this_is_a_test_string', 0)

0 comments on commit 0d4c2be

Please sign in to comment.