PYTHON-2489 Fix "no server" test suite, fix unified test runCommand (#543)

Author: ShaneHarvey

test/__init__.py

@@ -920,14 +920,15 @@ def teardown():
     if garbage:
         assert False, '\n'.join(garbage)
     c = client_context.client
-    if c and not client_context.is_data_lake:
-        c.drop_database("pymongo-pooling-tests")
-        c.drop_database("pymongo_test")
-        c.drop_database("pymongo_test1")
-        c.drop_database("pymongo_test2")
-        c.drop_database("pymongo_test_mike")
-        c.drop_database("pymongo_test_bernie")
-    c.close()
+    if c:
+        if not client_context.is_data_lake:
+            c.drop_database("pymongo-pooling-tests")
+            c.drop_database("pymongo_test")
+            c.drop_database("pymongo_test1")
+            c.drop_database("pymongo_test2")
+            c.drop_database("pymongo_test_mike")
+            c.drop_database("pymongo_test_bernie")
+        c.close()
 
     # Jython does not support gc.get_objects.
     if not sys.platform.startswith('java'):

test/unified_format.py

@@ -674,9 +674,13 @@ def _collectionOperation_createChangeStream(self, target, *args, **kwargs):
         return self.__entityOperation_createChangeStream(
             target, *args, **kwargs)
 
-    def _databaseOperation_runCommand(self, target, *args, **kwargs):
+    def _databaseOperation_runCommand(self, target, **kwargs):
         self.__raise_if_unsupported('runCommand', target, Database)
-        return target.command(*args, **kwargs)
+        # Ensure the first key is the command name.
+        ordered_command = SON([(kwargs.pop('command_name'), 1)])
+        ordered_command.update(kwargs['command'])
+        kwargs['command'] = ordered_command
+        return target.command(**kwargs)
 
     def __entityOperation_aggregate(self, target, *args, **kwargs):
         self.__raise_if_unsupported('aggregate', target, Database, Collection)