Merge branch 'master' of https://github.com/testcontainers/testcontainers-python into npipe-hostname-fix

Author: arpost

requirements.in

@@ -1,5 +1,5 @@
 -e file:.[docker-compose,mysql,oracle,postgresql,selenium,google-cloud-pubsub,mongo,redis,mssqlserver]
-codecov
+codecov>=2.1.0
 flake8
 pytest
 pytest-cov

requirements/3.5.txt

@@ -15,7 +15,7 @@ cachetools==4.0.0         # via google-auth
 certifi==2019.11.28       # via requests
 cffi==1.14.0              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via requests
-codecov==2.0.15           # via -r requirements.in
+codecov==2.1.7            # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
 crayons==0.3.0            # via testcontainers

requirements/3.6.txt

@@ -15,7 +15,7 @@ cachetools==4.0.0         # via google-auth
 certifi==2019.11.28       # via requests
 cffi==1.14.0              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via requests
-codecov==2.0.15           # via -r requirements.in
+codecov==2.1.7            # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
 crayons==0.3.0            # via testcontainers

requirements/3.7.txt

@@ -15,7 +15,7 @@ cachetools==4.0.0         # via google-auth
 certifi==2019.11.28       # via requests
 cffi==1.14.0              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via requests
-codecov==2.0.15           # via -r requirements.in
+codecov==2.1.7            # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
 crayons==0.3.0            # via testcontainers

requirements/3.8.txt

@@ -15,7 +15,7 @@ cachetools==4.0.0         # via google-auth
 certifi==2019.11.28       # via requests
 cffi==1.14.0              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via requests
-codecov==2.0.15           # via -r requirements.in
+codecov==2.1.7            # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
 crayons==0.3.0            # via testcontainers

setup.py

@@ -19,7 +19,7 @@
 setuptools.setup(
     name='testcontainers',
     packages=setuptools.find_packages(exclude=['tests']),
-    version='3.0.2',
+    version='3.0.3',
     description='Library provides lightweight, throwaway instances of common databases, Selenium '
                 'web browsers, or anything else that can run in a Docker container',
     author='Sergey Pirogov',

testcontainers/compose.py

@@ -22,14 +22,19 @@ class DockerCompose(object):
     -------
     ::
 
-        with DockerCompose("/home/project", pull=True) as compose:
+        with DockerCompose("/home/project",
+                           compose_file_name=["docker-compose-1.yml", "docker-compose-2.yml"],
+                           pull=True) as compose:
             host = compose.get_service_host("hub", 4444)
             port = compose.get_service_port("hub", 4444)
             driver = webdriver.Remote(
                 command_executor=("http://{}:{}/wd/hub".format(host,port)),
                 desired_capabilities=CHROME,
             )
             driver.get("http://automation-remarks.com")
+            stdout, stderr = compose.get_logs()
+            if stderr:
+                print("Errors\\n:{}".format(stderr))
 
 
     .. code-block:: yaml
@@ -57,7 +62,9 @@ def __init__(
             compose_file_name="docker-compose.yml",
             pull=False):
         self.filepath = filepath
-        self.compose_file_name = compose_file_name
+        self.compose_file_names = compose_file_name if isinstance(
+            compose_file_name, (list, tuple)
+        ) else [compose_file_name]
         self.pull = pull
 
     def __enter__(self):
@@ -67,18 +74,35 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.stop()
 
+    def docker_compose_command(self):
+        docker_compose_cmd = ['docker-compose']
+        for file in self.compose_file_names:
+            docker_compose_cmd += ['-f', file]
+        return docker_compose_cmd
+
     def start(self):
         with blindspin.spinner():
             if self.pull:
-                subprocess.call(["docker-compose", "-f", self.compose_file_name, "pull"],
-                                cwd=self.filepath)
-            subprocess.call(["docker-compose", "-f", self.compose_file_name, "up", "-d"],
-                            cwd=self.filepath)
+                pull_cmd = self.docker_compose_command() + ['pull']
+                subprocess.call(pull_cmd, cwd=self.filepath)
+            up_cmd = self.docker_compose_command() + ['up', '-d']
+            subprocess.call(up_cmd, cwd=self.filepath)
 
     def stop(self):
         with blindspin.spinner():
-            subprocess.call(["docker-compose", "-f", self.compose_file_name, "down", "-v"],
-                            cwd=self.filepath)
+            down_cmd = self.docker_compose_command() + ['down', '-v']
+            subprocess.call(down_cmd, cwd=self.filepath)
+
+    def get_logs(self):
+        logs_cmd = self.docker_compose_command() + ["logs"]
+        with blindspin.spinner():
+            result = subprocess.run(
+                logs_cmd,
+                cwd=self.filepath,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )
+            return result.stdout, result.stderr
 
     def get_service_port(self, service_name, port):
         return self._get_service_info(service_name, port)[1]
@@ -87,9 +111,8 @@ def get_service_host(self, service_name, port):
         return self._get_service_info(service_name, port)[0]
 
     def _get_service_info(self, service, port):
-        cmd_as_list = ["docker-compose", "-f", self.compose_file_name, "port", service, str(port)]
-        output = subprocess.check_output(cmd_as_list,
-                                         cwd=self.filepath).decode("utf-8")
+        port_cmd = self.docker_compose_command() + ["port", service, str(port)]
+        output = subprocess.check_output(port_cmd, cwd=self.filepath).decode("utf-8")
         result = str(output).rstrip().split(":")
         if len(result) == 1:
             raise NoSuchPortExposed("Port {} was not exposed for service {}"

testcontainers/core/generic.py

@@ -17,8 +17,8 @@
 
 
 class DbContainer(DockerContainer):
-    def __init__(self, image):
-        super(DbContainer, self).__init__(image)
+    def __init__(self, image, **kwargs):
+        super(DbContainer, self).__init__(image, **kwargs)
 
     @wait_container_is_ready()
     def _connect(self):
@@ -29,12 +29,17 @@ def _connect(self):
     def get_connection_url(self):
         raise NotImplementedError
 
-    def _create_connection_url(self, dialect, username, password, port, db_name):
+    def _create_connection_url(self, dialect, username, password, port, db_name=None):
+        if self._container is None:
+            raise RuntimeError("container has not been started")
         host = self.get_container_host_ip()
         port = self.get_exposed_port(port)
-        return "{dialect}://{username}:{password}@{host}:{port}/{db}".format(
-            dialect=dialect, username=username, password=password, host=host, port=port, db=db_name
+        url = "{dialect}://{username}:{password}@{host}:{port}".format(
+            dialect=dialect, username=username, password=password, host=host, port=port
         )
+        if db_name:
+            url += '/' + db_name
+        return url
 
     def start(self):
         self._configure()

testcontainers/mongodb.py

@@ -12,10 +12,11 @@
 #    under the License.
 import os
 
-from testcontainers.core.generic import DockerContainer
+from testcontainers.core.generic import DbContainer
+from testcontainers.core.waiting_utils import wait_container_is_ready
 
 
-class MongoDbContainer(DockerContainer):
+class MongoDbContainer(DbContainer):
     """
     Mongo document-based database container.
 
@@ -49,23 +50,29 @@ class MongoDbContainer(DockerContainer):
     MONGO_INITDB_ROOT_PASSWORD = os.environ.get("MONGO_INITDB_ROOT_PASSWORD", "test")
     MONGO_DB = os.environ.get("MONGO_DB", "test")
 
-    def __init__(self, image="mongodb:latest"):
+    def __init__(self, image="mongo:latest"):
         super(MongoDbContainer, self).__init__(image=image)
         self.command = "mongo"
         self.port_to_expose = 27017
         self.with_exposed_ports(self.port_to_expose)
 
     def _configure(self):
-
         self.with_env("MONGO_INITDB_ROOT_USERNAME", self.MONGO_INITDB_ROOT_USERNAME)
         self.with_env("MONGO_INITDB_ROOT_PASSWORD", self.MONGO_INITDB_ROOT_PASSWORD)
         self.with_env("MONGO_DB", self.MONGO_DB)
 
     def get_connection_url(self):
-        port = self.get_exposed_port(self.port_to_expose)
-        return "mongodb://{}:{}".format(self.get_container_host_ip(), port)
+        return self._create_connection_url(
+            dialect='mongodb',
+            username=self.MONGO_INITDB_ROOT_USERNAME,
+            password=self.MONGO_INITDB_ROOT_PASSWORD,
+            port=self.port_to_expose,
+        )
 
-    def get_connection_client(self):
+    @wait_container_is_ready()
+    def _connect(self):
         from pymongo import MongoClient
-        return MongoClient("mongodb://{}:{}".format(self.get_container_host_ip(),
-                                                    self.get_exposed_port(self.port_to_expose)))
+        return MongoClient(self.get_connection_url())
+
+    def get_connection_client(self):
+        return self._connect()

tests/docker-compose-2.yml

@@ -0,0 +1,6 @@
+mysql:
+  image: mysql
+  ports:
+    - "3306:3306"
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: "true"

tests/test_db_containers.py

@@ -1,14 +1,15 @@
 import pytest
 import sqlalchemy
 from pymongo import MongoClient
+from pymongo.errors import OperationFailure
 
 from testcontainers.core.generic import GenericContainer
 from testcontainers.core.waiting_utils import wait_for
+from testcontainers.mongodb import MongoDbContainer
 from testcontainers.mssql import SqlServerContainer
 from testcontainers.mysql import MySqlContainer, MariaDbContainer
 from testcontainers.oracle import OracleDbContainer
 from testcontainers.postgres import PostgresContainer
-from testcontainers.mongodb import MongoDbContainer
 
 
 def test_docker_run_mysql():
@@ -73,6 +74,16 @@ def test_docker_run_mongodb():
         assert cursor.next()['restaurant_id'] == doc['restaurant_id']
 
 
+def test_docker_run_mongodb_connect_without_credentials():
+    mongo_container = MongoDbContainer()
+    with mongo_container as mongo:
+        connection_url = "mongodb://{}:{}".format(mongo.get_container_host_ip(),
+                                                  mongo.get_exposed_port(mongo.port_to_expose))
+        db = MongoClient(connection_url).test
+        with pytest.raises(OperationFailure):
+            db.restaurants.insert_one({})
+
+
 def test_docker_generic_db():
     mongo_container = GenericContainer("mongo:latest")
     mongo_container.with_bind_ports(27017, 27017)

tests/test_docker_compose.py

@@ -31,3 +31,25 @@ def test_compose_wait_for_container_ready():
     with DockerCompose("tests") as compose:
         docker = DockerClient()
         compose.wait_for("http://%s:4444/wd/hub" % docker.host())
+
+
+def test_can_parse_multiple_compose_files():
+    with DockerCompose(filepath="tests",
+                       compose_file_name=["docker-compose.yml", "docker-compose-2.yml"]) as compose:
+        host = compose.get_service_host("mysql", 3306)
+        port = compose.get_service_port("mysql", 3306)
+        assert host == "0.0.0.0"
+        assert port == "3306"
+
+        host = compose.get_service_host("hub", 4444)
+        port = compose.get_service_port("hub", 4444)
+        assert host == "0.0.0.0"
+        assert port == "4444"
+
+
+def test_can_get_logs():
+    with DockerCompose("tests") as compose:
+        docker = DockerClient()
+        compose.wait_for("http://%s:4444/wd/hub" % docker.host())
+        stdout, stderr = compose.get_logs()
+        assert stdout, 'There should be something on stdout'