[_519] updated test for irods_ssl_verify_server = "none"

Issue #281 needs fixing again due to a regression!

Author: d-w-moore

irods/test/login_auth_test.py

@@ -24,6 +24,7 @@
 from re import compile as regex
 import gc
 import six
+from irods.test.setupssl import create_ssl_dir
 
 #
 # Allow override to specify the PAM password in effect for the test rodsuser.
@@ -511,18 +512,16 @@ def test_ssl_with_server_verify_set_to_none_281(self):
         with helpers.file_backed_up(env_file):
             with open(env_file) as env_file_handle:
                 env = json.load( env_file_handle )
-            create_ssl_dir(ssl_dir='./some')
-            env.update({
-                         #"irods_ssl_ca_certificate_file": "./some/irods.crt",  # does not need to match server cert
-            #            "irods_client_server_negotiation": "request_server_negotiation",
-            #            "irods_client_server_policy": "CS_NEG_REQUIRE",
-            #            "irods_ssl_ca_certificate_file": "/path/to/some/file.crt",  # does not need to exist
-                         "irods_ssl_verify_server": "none",
-            #            "irods_encryption_key_size": 32,
-            #            "irods_encryption_salt_size": 8,
-            #            "irods_encryption_num_hash_rounds": 16,
-            #            "irods_encryption_algorithm": "AES-256-CBC" 
-            })
+            my_ssl_directory = os.path.expanduser("~/some")
+            create_ssl_dir(ssl_dir = my_ssl_directory)
+            keys_to_update = {key:value.replace("/etc/irods/ssl",my_ssl_directory)
+                              for key,value in env.items() if type(value) is str and value.startswith("/etc/irods/ssl")}
+            keys_to_update["irods_ssl_verify_server"] = "none"
+            env.update( keys_to_update )
+            # --- TODO: remove these lines
+            import pprint
+            print ("Updated = \n", pprint.pformat(env))
+            # ---
             with open(env_file,'w') as f:
                 json.dump(env,f)
             with helpers.make_session() as session: