Merge pull request pytest-dev#121 from manahl/xfang-fix-hostname-access

fix hostname access

CHANGES.md

@@ -1,7 +1,10 @@
 
 ## Changelog
 
-### 1.6.0 (Unreleased)
+### 1.6.1 (Unrelease)
+ * pytest-server-fixtures: fix exception when attempting to access hostname while server is not started
+
+### 1.6.0 (2019-02-12)
  * pytest-server-fixtures: added previously removed TestServerV2.kill() function
  * pytest-profiling: pin more-itertools==5.0.0 in integration tests, as that's a PY3 only release
 

VERSION

@@ -1 +1 @@
-1.7.0
+1.6.1

pytest-server-fixtures/pytest_server_fixtures/base2.py

@@ -106,6 +106,8 @@ def hostname(self):
         """
         Get the IP address of the server.
         """
+        if not self._server:
+            return None
         return self._server.hostname
 
     @property

pytest-server-fixtures/pytest_server_fixtures/mongo.py

@@ -122,6 +122,12 @@ def check_server_up(self):
         import pymongo
         from pymongo.errors import AutoReconnect, ConnectionFailure
 
+        # Hostname must exist before continuing
+        # Some server class (e.g. Docker) will only allocate an IP after the
+        # container has started.
+        if not self.hostname:
+            return False
+
         log.info("Connecting to Mongo at %s:%s" % (self.hostname, self.port))
         try:
             self.api = pymongo.MongoClient(self.hostname, self.port,

pytest-server-fixtures/pytest_server_fixtures/redis.py

@@ -107,10 +107,14 @@ def port(self):
     def check_server_up(self):
         """ Ping the server
         """
+        print("pinging Redis at %s:%s db %s" % (
+            self.hostname, self.port, self.db
+        ))
+
+        if not self.hostname:
+            return False
+
         try:
-            print("pinging Redis at %s:%s db %s" % (
-                self.hostname, self.port, self.db
-            ))
             return self.api.ping()
         except redis.ConnectionError as e:
             print("server not up yet (%s)" % e)

pytest-server-fixtures/pytest_server_fixtures/rethink.py

@@ -173,6 +173,10 @@ def check_server_up(self):
         """Test connection to the server."""
         log.info("Connecting to RethinkDB at {0}:{1}".format(
             self.hostname, self.port))
+
+        if not self.hostname:
+            return False
+
         try:
             self.conn = rethinkdb.connect(host=self.hostname,
                                           port=self.port, db='test')

pytest-server-fixtures/tests/unit/test_server_v2_unit.py

@@ -12,3 +12,7 @@ def test_init():
         assert ts._cwd == sentinel.cwd
         assert ts._server_class == sentinel.server_class
 
+def test_hostname_when_server_is_not_started():
+    ts = _TestServerV2()
+    assert ts.hostname == None
+