[#3][#562] skip issue 562 (leaking connections) test for Python2

Silence Python2 string-type mismatches.

These also caused some tests to fail if they were logging to io.BytesIO objects.

Author: d-w-moore

irods/manager/data_object_manager.py

@@ -430,7 +430,7 @@ def make_FileOpenRequest(**extra_opts):
                 returned_values['session'] = directed_sess
                 conn.release()
                 conn = directed_sess.pool.get_connection()
-                logger.debug('redirect_to_host = %s', redirected_host)
+                logger.debug(u'redirect_to_host = %s', redirected_host)
 
         # Restore RESC HIER for DATA_OBJ_OPEN call
         if requested_hierarchy is not None:

irods/parallel.py

@@ -340,7 +340,7 @@ def bytes_range_for_thread( i, num_threads, total_bytes,  chunk ):
 
     ranges = [bytes_range_for_thread(i, num_threads, total_size, bytes_per_thread) for i in range(num_threads)]
 
-    logger.info("num_threads = %s ; bytes_per_thread = %s", num_threads, bytes_per_thread)
+    logger.info(u"num_threads = %s ; bytes_per_thread = %s", num_threads, bytes_per_thread)
 
     _queueLength = extra_options.get('_queueLength',0)
     if _queueLength > 0:
@@ -364,7 +364,7 @@ def bytes_range_for_thread( i, num_threads, total_bytes,  chunk ):
                                                 kw.RESC_HIER_STR_KW: hier_str,
                                                 kw.REPLICA_TOKEN_KW: replica_token })
         mgr.add_io( Io )
-        logger.debug('target_host = %s', Io.raw.session.pool.account.host)
+        logger.debug(u'target_host = %s', Io.raw.session.pool.account.host)
         if File is None: File = gen_file_handle()
         futures.append(executor.submit( _io_part, Io, byte_range, File, Operation, mgr, str(counter), queueObject))
         counter += 1

irods/test/data_obj_test.py

@@ -107,8 +107,9 @@ def tearDown(self):
         self.sess.cleanup()
 
     @staticmethod
-    def In_Memory_Stream():
-        return io.BytesIO() if sys.version_info < (3,) else io.StringIO()
+    def In_Memory_Stream(always_unicode = False):
+        return io.StringIO() if sys.version_info >= (3,) or always_unicode \
+            else io.BytesIO()
 
 
     @contextlib.contextmanager
@@ -318,9 +319,9 @@ def test_put_get_parallel_autoswitch_A__235(self):
             options = { kw.DEST_RESC_NAME_KW:Root,
                         kw.RESC_NAME_KW:Root }
 
-            PUT_LOG = self.In_Memory_Stream()
-            GET_LOG = self.In_Memory_Stream()
-            NumThreadsRegex = re.compile('^num_threads\s*=\s*(\d+)',re.MULTILINE)
+            PUT_LOG = self.In_Memory_Stream(always_unicode = True)
+            GET_LOG = self.In_Memory_Stream(always_unicode = True)
+            NumThreadsRegex = re.compile(u'^num_threads\s*=\s*(\d+)',re.MULTILINE)
 
             try:
                 logger = logging.getLogger('irods.parallel')
@@ -830,7 +831,7 @@ def do_test_redirect_in_data_object_put_and_get__issue_452(self, content, data_c
                 data_ctx['initialize']()
                 sess = data_ctx['session']
                 remote_name = data_ctx['path']
-                PUT_LOG = self.In_Memory_Stream()
+                PUT_LOG = self.In_Memory_Stream(always_unicode = True)
                 with helpers.enableLogging(logging.getLogger('irods.manager.data_object_manager'),
                                            logging.StreamHandler, (PUT_LOG,), level_ = logging.DEBUG),\
                      helpers.enableLogging(logging.getLogger('irods.parallel'),
@@ -839,11 +840,11 @@ def do_test_redirect_in_data_object_put_and_get__issue_452(self, content, data_c
                 def srch(BUF):
                     nthr = 0
                     search_text = BUF.getvalue()
-                    find_iterator = itertools.chain( re.finditer('redirect_to_host = (\S+)', search_text),
-                                                     re.finditer('target_host = (\S+)', search_text) )
+                    find_iterator = itertools.chain( re.finditer(u'redirect_to_host = (\S+)', search_text),
+                                                     re.finditer(u'target_host = (\S+)', search_text) )
                     for match in find_iterator:
                         nthr += 1
-                        self.assertEqual(match.group(1), 'localhost')
+                        self.assertEqual(match.group(1), u'localhost')
                     occur_threshold = (1 if len(content) <= 32*MEBI else 2)
                     self.assertGreaterEqual(nthr, occur_threshold)
                 srch(PUT_LOG)
@@ -858,7 +859,7 @@ def srch(BUF):
                     data_ctx_get = next(generator)
                     data_ctx_get['initialize']()
                     sess = data_ctx_get['session']
-                GET_LOG = self.In_Memory_Stream()
+                GET_LOG = self.In_Memory_Stream(always_unicode = True)
                 with helpers.enableLogging(logging.getLogger('irods.manager.data_object_manager'),
                                            logging.StreamHandler, (GET_LOG,), level_ = logging.DEBUG),\
                      helpers.enableLogging(logging.getLogger('irods.parallel'),
@@ -2097,6 +2098,7 @@ def test_touch_operation_does_not_work_when_given_a_collection__525(self):
         with self.assertRaises(ex.InvalidInputArgument):
             user_session.data_objects.touch(home_collection_path)
 
+    @unittest.skipIf(six.PY2, "Python2 won't destruct an out-of-scope iRODSSession due to lazy GC ref-cycle detection.")
     def test_client_redirect_lets_go_of_connections__issue_562(self):
         self._skip_unless_connected_to_local_computer_by_other_than_localhost_synonym()
         # Force data object connections to redirect by enforcing a non-equivalent hostname for their resource