[#3] fix failing tests

   - Correct DEST_RESC (vs. RESC) oversights in irods/irods#5848 related tests.

   - Correct tests failing for QUASI_XML under Python2.

   - instances of fix Python 2 / unicode mismatch causing tests to fail.

Author: d-w-moore

irods/test/data_obj_test.py

@@ -123,7 +123,7 @@ def write_and_check_replica_on_parallel_connections( self, data_object_path, roo
         Then we assert the file contents and dispose of the data object."""
 
         try:
-            self.sess.data_objects.create(data_object_path, **{kw.RESC_NAME_KW: root_resc} )
+            self.sess.data_objects.create(data_object_path, resource = root_resc)
             for _ in range( seconds_to_wait_for_replicas ):
                 if required_num_replicas <= len( self.sess.data_objects.get(data_object_path).replicas ): break
                 time.sleep(1)
@@ -137,7 +137,7 @@ def write_and_check_replica_on_parallel_connections( self, data_object_path, roo
             fd1.write(b'book')
             fd2.close()
             fd1.close()
-            with self.sess.data_objects.open(data_object_path, 'r', **{kw.RESC_NAME_KW: root_resc} ) as f:
+            with self.sess.data_objects.open(data_object_path, 'r', **{kw.DEST_RESC_NAME_KW: root_resc} ) as f:
                 self.assertEqual(f.read(), b'books\n')
         except Exception as e:
             logging.debug('Exception %r in [%s], called from [%s]', e, my_function_name(), caller_func)

irods/test/meta_test.py

@@ -9,6 +9,7 @@
 from irods.models import (DataObject, Collection, Resource)
 import irods.test.helpers as helpers
 from six.moves import range
+from six import PY3
 
 
 class TestMeta(unittest.TestCase):
@@ -165,7 +166,8 @@ def getKey(AVU):
         assert meta[1].units == self.unit1
 
         assert meta[2].name == attribute
-        assert meta[2].value == value
+        testValue = (value if PY3 else value.encode('utf8'))
+        assert meta[2].value == testValue
 
 
     def test_add_obj_meta_empty(self):

irods/test/query_test.py

@@ -369,8 +369,8 @@ def test_query_for_data_object_with_utf8_name_python2(self):
             results = self.sess.query(DataObject, Collection.name).filter(DataObject.path == test_file).first()
             result_logical_path = os.path.join(results[Collection.name], results[DataObject.name])
             result_physical_path = results[DataObject.path]
-            self.assertEqual(result_logical_path, obj_path.decode('utf8'))
-            self.assertEqual(result_physical_path, test_file.decode('utf8'))
+            self.assertEqual(result_logical_path, obj_path)
+            self.assertEqual(result_physical_path, test_file)
         finally:
             if results: self.sess.data_objects.unregister(obj_path)
             os.remove(test_file)

irods/test/unicode_test.py

@@ -9,6 +9,7 @@
 from irods.message import (ET as ET_set, XML_Parser_Type, current_XML_parser, default_XML_parser)
 import logging
 import irods.test.helpers as helpers
+from six import PY3
 
 logger = logging.getLogger(__name__)
 
@@ -90,16 +91,24 @@ def test_files(self):
         query = self.sess.query(DataObject.name, Collection.name).filter(
             Collection.name == self.coll_path)
 
+        # Python2 compatibility note:  In keeping with the principle of least surprise, we now ensure
+        # queries return values of 'str' type in Python2.  When and if these quantities have a possibility
+        # of representing unicode quantities, they can then go through a decode stage.
+
+        encode_unless_PY3 = (lambda x:x) if PY3 else (lambda x:x.encode('utf8'))
+        decode_unless_PY3 = (lambda x:x) if PY3 else (lambda x:x.decode('utf8'))
+
         for result in query:
             # check that we got back one of our original names
-            assert result[DataObject.name] in self.names
+            assert result[DataObject.name] in ( [encode_unless_PY3(n) for n in self.names] )
 
             # fyi
-            logger.info(
-                u"{0}/{1}".format(result[Collection.name], result[DataObject.name]))
+            logger.info( u"{0}/{1}".format( decode_unless_PY3(result[Collection.name]),
+                                            decode_unless_PY3(result[DataObject.name]) )
+                       )
 
             # remove from set
-            self.names.remove(result[DataObject.name])
+            self.names.remove(decode_unless_PY3(result[DataObject.name]))
 
         # make sure we got all of them
         self.assertEqual(0, len(self.names))