connect to a single mongos

Author: prashantmital

test/__init__.py

@@ -106,10 +106,11 @@
     db_user = res['username'] or db_user
     db_pwd = res['password'] or db_pwd
 elif TEST_SERVERLESS:
-    uri = os.environ["MONGODB_URI"]
-    host = "mongodb://%s:%s@%s" % (
-        db_user, db_pwd, str(uri).lstrip("mongodb://"))
-    port = None
+    res = parse_uri(os.environ["MONGODB_URI"])
+    host, port = res['nodelist'].pop(0)
+    additional_serverless_mongoses = res['nodelist']
+    db_user = res['username'] or db_user
+    db_pwd = res['password'] or db_pwd
     TLS_OPTIONS = {'tls': True}
 
 
@@ -393,6 +394,7 @@ def _init_client(self):
             if TEST_SERVERLESS:
                 self.test_commands_enabled = True
                 self.has_ipv6 = False
+
             else:
                 self.server_parameters = self.client.admin.command(
                     'getParameter', '*')
@@ -407,14 +409,19 @@ def _init_client(self):
                         if params.get('enableTestCommands') == '1':
                             self.test_commands_enabled = True
                     self.has_ipv6 = self._server_started_with_ipv6()
-                self.is_mongos = (self.ismaster.get('msg') == 'isdbgrid')
-                if self.is_mongos:
+
+            self.is_mongos = (self.ismaster.get('msg') == 'isdbgrid')
+            if self.is_mongos:
+                if self.serverless:
+                    self.mongoses.append(self.client.address)
+                    self.mongoses.extend(additional_serverless_mongoses)
+                else:
                     # Check for another mongos on the next port.
                     address = self.client.address
                     next_address = address[0], address[1] + 1
                     self.mongoses.append(address)
-                    mongos_client = self._connect(*next_address,
-                                                  **self.default_client_options)
+                    mongos_client = self._connect(
+                        *next_address, **self.default_client_options)
                     if mongos_client:
                         ismaster = mongos_client.admin.command('ismaster')
                         if ismaster.get('msg') == 'isdbgrid':
@@ -444,10 +451,7 @@ def port(self):
 
     @property
     def pair(self):
-        if self.port:
-            return "%s:%d" % (self.host, self.port)
-        else:
-            return "%s" % (self.host, )
+        return "%s:%d" % (self.host, self.port)
 
     @property
     def has_secondaries(self):

test/test_client.py

@@ -224,7 +224,8 @@ def iterate():
         self.assertRaises(TypeError, iterate)
 
     def test_get_default_database(self):
-        c = rs_or_single_client("mongodb://%s/foo" % (client_context.pair, ),
+        c = rs_or_single_client("mongodb://%s:%d/foo" % (client_context.host,
+                                                         client_context.port),
                                 connect=False)
         self.assertEqual(Database(c, 'foo'), c.get_default_database())
         # Test that default doesn't override the URI value.
@@ -239,36 +240,42 @@ def test_get_default_database(self):
         self.assertEqual(ReadPreference.SECONDARY, db.read_preference)
         self.assertEqual(write_concern, db.write_concern)
 
-        c = rs_or_single_client("mongodb://%s/" % (client_context.pair, ),
+        c = rs_or_single_client("mongodb://%s:%d/" % (client_context.host,
+                                                      client_context.port),
                                 connect=False)
         self.assertEqual(Database(c, 'foo'), c.get_default_database('foo'))
 
     def test_get_default_database_error(self):
         # URI with no database.
-        c = rs_or_single_client("mongodb://%s/" % (client_context.pair, ),
+        c = rs_or_single_client("mongodb://%s:%d/" % (client_context.host,
+                                                      client_context.port),
                                 connect=False)
         self.assertRaises(ConfigurationError, c.get_default_database)
 
     def test_get_default_database_with_authsource(self):
         # Ensure we distinguish database name from authSource.
-        uri = "mongodb://%s/foo?authSource=src" % (client_context.pair, )
+        uri = "mongodb://%s:%d/foo?authSource=src" % (
+            client_context.host, client_context.port)
         c = rs_or_single_client(uri, connect=False)
         self.assertEqual(Database(c, 'foo'), c.get_default_database())
 
     def test_get_database_default(self):
-        c = rs_or_single_client("mongodb://%s/foo" % (client_context.pair, ),
+        c = rs_or_single_client("mongodb://%s:%d/foo" % (client_context.host,
+                                                         client_context.port),
                                 connect=False)
         self.assertEqual(Database(c, 'foo'), c.get_database())
 
     def test_get_database_default_error(self):
         # URI with no database.
-        c = rs_or_single_client("mongodb://%s/" % (client_context.pair, ),
+        c = rs_or_single_client("mongodb://%s:%d/" % (client_context.host,
+                                                      client_context.port),
                                 connect=False)
         self.assertRaises(ConfigurationError, c.get_database)
 
     def test_get_database_default_with_authsource(self):
         # Ensure we distinguish database name from authSource.
-        uri = "mongodb://%s/foo?authSource=src" % (client_context.pair, )
+        uri = "mongodb://%s:%d/foo?authSource=src" % (
+            client_context.host, client_context.port)
         c = rs_or_single_client(uri, connect=False)
         self.assertEqual(Database(c, 'foo'), c.get_database())
 
@@ -365,9 +372,10 @@ def test_uri_codec_options(self):
         # Ensure codec options are passed in correctly
         uuid_representation_label = 'javaLegacy'
         unicode_decode_error_handler = 'ignore'
-        uri = ("mongodb://%s/foo?tz_aware=true&uuidrepresentation="
+        uri = ("mongodb://%s:%d/foo?tz_aware=true&uuidrepresentation="
                "%s&unicode_decode_error_handler=%s" % (
-                   client_context.pair,
+                   client_context.host,
+                   client_context.port,
                    uuid_representation_label,
                    unicode_decode_error_handler))
         c = MongoClient(uri, connect=False)
@@ -1362,8 +1370,8 @@ def init(self, *args):
         try:
             ServerHeartbeatStartedEvent.__init__ = init
             listener = HeartbeatStartedListener()
-            uri = "mongodb://%s/?heartbeatFrequencyMS=500" % (
-                client_context.pair, )
+            uri = "mongodb://%s:%d/?heartbeatFrequencyMS=500" % (
+                client_context.host, client_context.port)
             client = single_client(uri, event_listeners=[listener])
             wait_until(lambda: len(listener.results) >= 2,
                        "record two ServerHeartbeatStartedEvents")