fix handling of hint in bulk

Author: prashantmital

test/unified_format.py

@@ -286,11 +286,11 @@ def get_lsid_for_session(self, session_name):
 if not PY3:
     binary_types = (Binary,)
     long_types = (Int64, long)
-    unicode_types = (unicode,)
+    unicode_type = unicode
 else:
     binary_types = (Binary, bytes)
     long_types = (Int64,)
-    unicode_types = (str,)
+    unicode_type = str
 
 
 BSON_TYPE_ALIAS_MAP = {
@@ -308,9 +308,9 @@ def get_lsid_for_session(self, session_name):
     'null': (type(None),),
     'regex': (Regex, RE_TYPE),
     'dbPointer': (DBRef,),
-    'javascript': (*unicode_types, Code),
-    'symbol': unicode_types,
-    'javascriptWithScope': (*unicode_types, Code),
+    'javascript': (unicode_type, Code),
+    'symbol': (unicode_type,),
+    'javascriptWithScope': (unicode_type, Code),
     'int': (int,),
     'long': (Int64,),
     'decimal': (Decimal128,),
@@ -928,7 +928,7 @@ def test_case(self):
             test_name = 'test_%s' % (description.strip('. ').
                                      replace(' ', '_').replace('.', '_'),)
             test_method = create_test(copy.deepcopy(test_spec))
-            test_method.__name__ = test_name
+            test_method.__name__ = str(test_name)
 
             for fail_pattern in cls.EXPECTED_FAILURES:
                 if re.search(fail_pattern, description):

test/utils.py

@@ -988,13 +988,23 @@ def parse_spec_options(opts):
     if 'requests' in opts:
         reqs = opts.pop('requests')
         for req in reqs:
-            args = req.pop('arguments', {})
-            if 'hint' in args:
-                hint = args.pop('hint')
-                if not isinstance(hint, string_type):
-                    hint = list(iteritems(hint))
+            if 'name' in req:
+                # CRUD v2 format
+                args = req.pop('arguments', {})
+                if 'hint' in args:
+                    hint = args.pop('hint')
+                    if not isinstance(hint, string_type):
+                        hint = list(iteritems(hint))
                 args['hint'] = hint
-            req['arguments'] = args
+                req['arguments'] = args
+            else:
+                # Unified test format
+                bulk_model, spec = next(iteritems(req))
+                if 'hint' in spec:
+                    hint = spec.pop('hint')
+                    if not isinstance(hint, string_type):
+                        hint = list(iteritems(hint))
+                    spec['hint'] = hint
         opts['requests'] = reqs
 
     return dict(opts)