From 6572f0924c6549b382cd04c8d7b514084e51ae96 Mon Sep 17 00:00:00 2001 From: d-w-moore Date: Thu, 18 Jul 2024 23:43:17 -0400 Subject: [PATCH] review suggestions --- irods/test/data_obj_test.py | 3 ++- irods/test/modules/test_xml_parser.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/irods/test/data_obj_test.py b/irods/test/data_obj_test.py index 7d89b958..1904143a 100644 --- a/irods/test/data_obj_test.py +++ b/irods/test/data_obj_test.py @@ -2024,11 +2024,12 @@ def test_settings_load_and_save_471(self): config.load(**load_logging_options) self.assertTrue(config.data_objects.auto_close, RANDOM_VALUE - i - 1) + @unittest.skipIf(os.environ.get("PYTHON_IRODSCLIENT_CONFIGURATION_PATH",None) is not None,"test will not run if configuration file set.") def test_setting_xml_parser_choice_by_environment_only__issue_584(self): program = os.path.join(test_modules.__path__[0], 'test_xml_parser.py') xml_parser_control_var = 'PYTHON_IRODSCLIENT_CONFIG__CONNECTIONS__XML_PARSER_DEFAULT' with helpers.environment_variable_backed_up(xml_parser_control_var): - for alternate_setting in ('QUASI_XML','STANDARD_XML', 'SECURE_XML'): + for alternate_setting in ('QUASI_XML', 'STANDARD_XML', 'SECURE_XML'): # Set xml parser for the process to be spawned. os.environ[xml_parser_control_var]="'{alternate_setting}'".format(**locals()) # Run a simple script that imports PRC and prints which XML parser is the active default. diff --git a/irods/test/modules/test_xml_parser.py b/irods/test/modules/test_xml_parser.py index f9a5cf48..f9c69854 100644 --- a/irods/test/modules/test_xml_parser.py +++ b/irods/test/modules/test_xml_parser.py @@ -1,2 +1,4 @@ import irods +# Used in test of: +# irods.test.data_obj_test.TestDataObjOps.test_setting_xml_parser_choice_by_environment_only__issue_584 print(irods.client_configuration.connections.xml_parser_default)