Merge branch 'master' into patch-1

Author: tillahoffmann

.travis.yml

@@ -22,6 +22,7 @@ install:
 
 script:
   - pipenv install --dev
+  - pipenv run flake8
   - pipenv run py.test -sv --cov-config .coveragerc --cov-report html:skip-covered --cov-report term:skip-covered --cov=testcontainers --tb=short tests/
   - codecov
 

Pipfile

@@ -4,6 +4,7 @@ verify_ssl = true
 
 ["dev-packages"]
 codecov = "*"
+flake8 = "*"
 
 [packages]
 crayons = "*"

Pipfile.lock

@@ -151,6 +151,3 @@
      author, 'testcontainers', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-

docs/conf.py

@@ -3,3 +3,6 @@ universal = 1
 
 [metadata]
 description-file = README.md
+
+[flake8]
+max-line-length = 100

setup.cfg

@@ -19,7 +19,7 @@
 setuptools.setup(
     name='testcontainers',
     packages=setuptools.find_packages(exclude=['tests']),
-    version='2.5',
+    version='2.5.0',
     description=('Library provides lightweight, throwaway '
                  'instances of common databases, '
                  'Selenium web browsers, or anything else that can '

setup.py

@@ -20,7 +20,8 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
     def start(self):
         with blindspin.spinner():
-            subprocess.call(["docker-compose", "-f", self.compose_file_name, "up", "-d"], cwd=self.filepath)
+            subprocess.call(["docker-compose", "-f", self.compose_file_name, "up", "-d"],
+                            cwd=self.filepath)
 
     def stop(self):
         with blindspin.spinner():

testcontainers/compose.py

@@ -4,7 +4,7 @@
 
 from testcontainers.core.docker_client import DockerClient
 from testcontainers.core.exceptions import ContainerStartException
-from testcontainers.core.utils import is_windows, inside_container
+from testcontainers.core.utils import inside_container
 
 
 class DockerContainer(object):
@@ -81,10 +81,7 @@ def get_container_host_ip(self) -> str:
         # container's IP address from the dockder "bridge" network
         if inside_container():
             return self.get_docker_client().bridge_ip(self._container.id)
-        elif is_windows():
-            return "localhost"
-        else:
-            return "0.0.0.0"
+        return "localhost"
 
     def get_exposed_port(self, port) -> str:
         if inside_container():

testcontainers/core/container.py

@@ -12,7 +12,8 @@
 #    under the License.
 
 
-from time import sleep
+import re
+import time
 
 import blindspin
 import crayons
@@ -40,7 +41,7 @@ def wrapper(wrapped, instance, args, kwargs):
                 try:
                     return wrapped(*args, **kwargs)
                 except Exception as e:
-                    sleep(config.SLEEP_TIME)
+                    time.sleep(config.SLEEP_TIME)
                     exception = e
             raise TimeoutException(
                 """Wait time exceeded {0} sec.
@@ -55,3 +56,37 @@ def wrapper(wrapped, instance, args, kwargs):
 @wait_container_is_ready()
 def wait_for(condition):
     return condition()
+
+
+def wait_for_logs(container, predicate, timeout=None, interval=1):
+    """
+    Wait for the container to emit logs satisfying the predicate.
+
+    Parameters
+    ----------
+    container : DockerContainer
+        Container whose logs to wait for.
+    predicate : callable or str
+        Predicate that should be satisfied by the logs. If a string, the it is used as the pattern
+        for a multiline regular expression search.
+    timeout : float or None
+        Number of seconds to wait for the predicate to be satisfied. Defaults to wait indefinitely.
+    interval : float
+        Interval at which to poll the logs.
+
+    Returns
+    -------
+    duration : float
+        Number of seconds until the predicate was satisfied.
+    """
+    if isinstance(predicate, str):
+        predicate = re.compile(predicate, re.MULTILINE).search
+    start = time.time()
+    while True:
+        duration = time.time() - start
+        if predicate(container._container.logs().decode()):
+            return duration
+        if timeout and duration > timeout:
+            raise TimeoutError("container did not emit logs satisfying predicate in %.3f seconds"
+                               % timeout)
+        time.sleep(interval)

testcontainers/core/waiting_utils.py

@@ -11,12 +11,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from testcontainers.core.container import DockerContainer
-from testcontainers.core.waiting_utils import wait_container_is_ready
 
 
 class TestContainer(DockerContainer):
     def __init__(self, image, port_to_expose=None):
-        super(RedisContainer, self).__init__(image)
+        super(TestContainer, self).__init__(image)
         if port_to_expose:
-		self.port_to_expose = port_to_expose
-	        self.with_exposed_ports(self.port_to_expose)
+            self.port_to_expose = port_to_expose
+            self.with_exposed_ports(self.port_to_expose)