Merge pull request #75 from FrancisLfg/update-redis-container

update redis container and add test

Author: tillahoffmann

requirements.in

@@ -1,4 +1,4 @@
--e file:.[docker-compose,mysql,oracle,postgresql,selenium,google-cloud-pubsub,mongo]
+-e file:.[docker-compose,mysql,oracle,postgresql,selenium,google-cloud-pubsub,mongo,redis]
 codecov
 flake8
 pytest

requirements/3.5.txt

@@ -4,30 +4,30 @@
 #
 #    pip-compile --output-file=requirements/3.5.txt requirements.in
 #
--e file:.
+-e file:.                 # via -r requirements.in
 attrs==19.3.0             # via jsonschema, pytest
 bcrypt==3.1.7             # via paramiko
-blindspin==2.0.1
+blindspin==2.0.1          # via testcontainers
 cached-property==1.5.1    # via docker-compose
 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
+codecov==2.0.15           # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
-crayons==0.3.0
+crayons==0.3.0            # via testcontainers
 cryptography==2.8         # via paramiko
-cx-oracle==7.3.0
-docker-compose==1.25.4
-docker[ssh]==4.2.0        # via docker-compose
+cx-oracle==7.3.0          # via testcontainers
+docker-compose==1.25.4    # via testcontainers
+docker[ssh]==4.2.0        # via docker-compose, testcontainers
 dockerpty==0.4.1          # via docker-compose
 docopt==0.6.2             # via docker-compose
 entrypoints==0.3          # via flake8
-flake8==3.7.9
+flake8==3.7.9             # via -r requirements.in
 google-api-core[grpc]==1.16.0  # via google-cloud-pubsub
 google-auth==1.11.2       # via google-api-core
-google-cloud-pubsub==1.2.0
+google-cloud-pubsub==1.2.0  # via testcontainers
 googleapis-common-protos[grpc]==1.51.0  # via google-api-core, grpc-google-iam-v1
 grpc-google-iam-v1==0.12.3  # via google-cloud-pubsub
 grpcio==1.27.2            # via google-api-core, googleapis-common-protos, grpc-google-iam-v1
@@ -38,35 +38,35 @@ mccabe==0.6.1             # via flake8
 more-itertools==8.2.0     # via pytest
 packaging==20.1           # via pytest
 paramiko==2.7.1           # via docker
-pathlib2==2.3.5           # via pytest
 pluggy==0.13.1            # via pytest
 protobuf==3.11.3          # via google-api-core, googleapis-common-protos
-psycopg2-binary==2.8.4
+psycopg2-binary==2.8.4    # via testcontainers
 py==1.8.1                 # via pytest
 pyasn1-modules==0.2.8     # via google-auth
 pyasn1==0.4.8             # via pyasn1-modules, rsa
 pycodestyle==2.5.0        # via flake8
 pycparser==2.19           # via cffi
 pyflakes==2.1.1           # via flake8
-pymongo==3.10.1
-pymysql==0.9.3
+pymongo==3.10.1           # via testcontainers
+pymysql==0.9.3            # via testcontainers
 pynacl==1.3.0             # via paramiko
 pyparsing==2.4.6          # via packaging
 pyrsistent==0.15.7        # via jsonschema
-pytest-cov==2.8.1
-pytest==5.3.5
+pytest-cov==2.8.1         # via -r requirements.in
+pytest==5.3.5             # via -r requirements.in, pytest-cov
 pytz==2019.3              # via google-api-core
 pyyaml==5.3               # via docker-compose
+redis==3.4.1              # via testcontainers
 requests==2.23.0          # via codecov, docker, docker-compose, google-api-core
 rsa==4.0                  # via google-auth
-selenium==3.141.0
-six==1.14.0               # via bcrypt, cryptography, docker, docker-compose, dockerpty, google-api-core, google-auth, grpcio, jsonschema, packaging, pathlib2, protobuf, pynacl, pyrsistent, websocket-client
-sqlalchemy==1.3.13
+selenium==3.141.0         # via testcontainers
+six==1.14.0               # via bcrypt, cryptography, docker, docker-compose, dockerpty, google-api-core, google-auth, grpcio, jsonschema, packaging, protobuf, pynacl, pyrsistent, websocket-client
+sqlalchemy==1.3.13        # via testcontainers
 texttable==1.6.2          # via docker-compose
 urllib3==1.25.8           # via requests, selenium
 wcwidth==0.1.8            # via pytest
 websocket-client==0.57.0  # via docker, docker-compose
-wrapt==1.12.0
+wrapt==1.12.0             # via testcontainers
 zipp==1.2.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/3.6.txt

@@ -4,30 +4,30 @@
 #
 #    pip-compile --output-file=requirements/3.6.txt requirements.in
 #
--e file:.
+-e file:.                 # via -r requirements.in
 attrs==19.3.0             # via jsonschema, pytest
 bcrypt==3.1.7             # via paramiko
-blindspin==2.0.1
+blindspin==2.0.1          # via testcontainers
 cached-property==1.5.1    # via docker-compose
 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
+codecov==2.0.15           # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
-crayons==0.3.0
+crayons==0.3.0            # via testcontainers
 cryptography==2.8         # via paramiko
-cx-oracle==7.3.0
-docker-compose==1.25.4
-docker[ssh]==4.2.0        # via docker-compose
+cx-oracle==7.3.0          # via testcontainers
+docker-compose==1.25.4    # via testcontainers
+docker[ssh]==4.2.0        # via docker-compose, testcontainers
 dockerpty==0.4.1          # via docker-compose
 docopt==0.6.2             # via docker-compose
 entrypoints==0.3          # via flake8
-flake8==3.7.9
+flake8==3.7.9             # via -r requirements.in
 google-api-core[grpc]==1.16.0  # via google-cloud-pubsub
 google-auth==1.11.2       # via google-api-core
-google-cloud-pubsub==1.2.0
+google-cloud-pubsub==1.2.0  # via testcontainers
 googleapis-common-protos[grpc]==1.51.0  # via google-api-core, grpc-google-iam-v1
 grpc-google-iam-v1==0.12.3  # via google-cloud-pubsub
 grpcio==1.27.2            # via google-api-core, googleapis-common-protos, grpc-google-iam-v1
@@ -40,32 +40,33 @@ packaging==20.1           # via pytest
 paramiko==2.7.1           # via docker
 pluggy==0.13.1            # via pytest
 protobuf==3.11.3          # via google-api-core, googleapis-common-protos
-psycopg2-binary==2.8.4
+psycopg2-binary==2.8.4    # via testcontainers
 py==1.8.1                 # via pytest
 pyasn1-modules==0.2.8     # via google-auth
 pyasn1==0.4.8             # via pyasn1-modules, rsa
 pycodestyle==2.5.0        # via flake8
 pycparser==2.19           # via cffi
 pyflakes==2.1.1           # via flake8
-pymongo==3.10.1
-pymysql==0.9.3
+pymongo==3.10.1           # via testcontainers
+pymysql==0.9.3            # via testcontainers
 pynacl==1.3.0             # via paramiko
 pyparsing==2.4.6          # via packaging
 pyrsistent==0.15.7        # via jsonschema
-pytest-cov==2.8.1
-pytest==5.3.5
+pytest-cov==2.8.1         # via -r requirements.in
+pytest==5.3.5             # via -r requirements.in, pytest-cov
 pytz==2019.3              # via google-api-core
 pyyaml==5.3               # via docker-compose
+redis==3.4.1              # via testcontainers
 requests==2.23.0          # via codecov, docker, docker-compose, google-api-core
 rsa==4.0                  # via google-auth
-selenium==3.141.0
+selenium==3.141.0         # via testcontainers
 six==1.14.0               # via bcrypt, cryptography, docker, docker-compose, dockerpty, google-api-core, google-auth, grpcio, jsonschema, packaging, protobuf, pynacl, pyrsistent, websocket-client
-sqlalchemy==1.3.13
+sqlalchemy==1.3.13        # via testcontainers
 texttable==1.6.2          # via docker-compose
 urllib3==1.25.8           # via requests, selenium
 wcwidth==0.1.8            # via pytest
 websocket-client==0.57.0  # via docker, docker-compose
-wrapt==1.12.0
+wrapt==1.12.0             # via testcontainers
 zipp==3.0.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/3.7.txt

@@ -4,30 +4,30 @@
 #
 #    pip-compile --output-file=requirements/3.7.txt requirements.in
 #
--e file:.
+-e file:.                 # via -r requirements.in
 attrs==19.3.0             # via jsonschema, pytest
 bcrypt==3.1.7             # via paramiko
-blindspin==2.0.1
+blindspin==2.0.1          # via testcontainers
 cached-property==1.5.1    # via docker-compose
 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
+codecov==2.0.15           # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
-crayons==0.3.0
+crayons==0.3.0            # via testcontainers
 cryptography==2.8         # via paramiko
-cx-oracle==7.3.0
-docker-compose==1.25.4
-docker[ssh]==4.2.0        # via docker-compose
+cx-oracle==7.3.0          # via testcontainers
+docker-compose==1.25.4    # via testcontainers
+docker[ssh]==4.2.0        # via docker-compose, testcontainers
 dockerpty==0.4.1          # via docker-compose
 docopt==0.6.2             # via docker-compose
 entrypoints==0.3          # via flake8
-flake8==3.7.9
+flake8==3.7.9             # via -r requirements.in
 google-api-core[grpc]==1.16.0  # via google-cloud-pubsub
 google-auth==1.11.2       # via google-api-core
-google-cloud-pubsub==1.2.0
+google-cloud-pubsub==1.2.0  # via testcontainers
 googleapis-common-protos[grpc]==1.51.0  # via google-api-core, grpc-google-iam-v1
 grpc-google-iam-v1==0.12.3  # via google-cloud-pubsub
 grpcio==1.27.2            # via google-api-core, googleapis-common-protos, grpc-google-iam-v1
@@ -40,32 +40,33 @@ packaging==20.1           # via pytest
 paramiko==2.7.1           # via docker
 pluggy==0.13.1            # via pytest
 protobuf==3.11.3          # via google-api-core, googleapis-common-protos
-psycopg2-binary==2.8.4
+psycopg2-binary==2.8.4    # via testcontainers
 py==1.8.1                 # via pytest
 pyasn1-modules==0.2.8     # via google-auth
 pyasn1==0.4.8             # via pyasn1-modules, rsa
 pycodestyle==2.5.0        # via flake8
 pycparser==2.19           # via cffi
 pyflakes==2.1.1           # via flake8
-pymongo==3.10.1
-pymysql==0.9.3
+pymongo==3.10.1           # via testcontainers
+pymysql==0.9.3            # via testcontainers
 pynacl==1.3.0             # via paramiko
 pyparsing==2.4.6          # via packaging
 pyrsistent==0.15.7        # via jsonschema
-pytest-cov==2.8.1
-pytest==5.3.5
+pytest-cov==2.8.1         # via -r requirements.in
+pytest==5.3.5             # via -r requirements.in, pytest-cov
 pytz==2019.3              # via google-api-core
 pyyaml==5.3               # via docker-compose
+redis==3.4.1              # via testcontainers
 requests==2.23.0          # via codecov, docker, docker-compose, google-api-core
 rsa==4.0                  # via google-auth
-selenium==3.141.0
+selenium==3.141.0         # via testcontainers
 six==1.14.0               # via bcrypt, cryptography, docker, docker-compose, dockerpty, google-api-core, google-auth, grpcio, jsonschema, packaging, protobuf, pynacl, pyrsistent, websocket-client
-sqlalchemy==1.3.13
+sqlalchemy==1.3.13        # via testcontainers
 texttable==1.6.2          # via docker-compose
 urllib3==1.25.8           # via requests, selenium
 wcwidth==0.1.8            # via pytest
 websocket-client==0.57.0  # via docker, docker-compose
-wrapt==1.12.0
+wrapt==1.12.0             # via testcontainers
 zipp==3.0.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/3.8.txt

@@ -4,30 +4,30 @@
 #
 #    pip-compile --output-file=requirements/3.8.txt requirements.in
 #
--e file:.
+-e file:.                 # via -r requirements.in
 attrs==19.3.0             # via jsonschema, pytest
 bcrypt==3.1.7             # via paramiko
-blindspin==2.0.1
+blindspin==2.0.1          # via testcontainers
 cached-property==1.5.1    # via docker-compose
 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
+codecov==2.0.15           # via -r requirements.in
 colorama==0.4.3           # via crayons
 coverage==5.0.3           # via codecov, pytest-cov
-crayons==0.3.0
+crayons==0.3.0            # via testcontainers
 cryptography==2.8         # via paramiko
-cx-oracle==7.3.0
-docker-compose==1.25.4
-docker[ssh]==4.2.0        # via docker-compose
+cx-oracle==7.3.0          # via testcontainers
+docker-compose==1.25.4    # via testcontainers
+docker[ssh]==4.2.0        # via docker-compose, testcontainers
 dockerpty==0.4.1          # via docker-compose
 docopt==0.6.2             # via docker-compose
 entrypoints==0.3          # via flake8
-flake8==3.7.9
+flake8==3.7.9             # via -r requirements.in
 google-api-core[grpc]==1.16.0  # via google-cloud-pubsub
 google-auth==1.11.2       # via google-api-core
-google-cloud-pubsub==1.2.0
+google-cloud-pubsub==1.2.0  # via testcontainers
 googleapis-common-protos[grpc]==1.51.0  # via google-api-core, grpc-google-iam-v1
 grpc-google-iam-v1==0.12.3  # via google-cloud-pubsub
 grpcio==1.27.2            # via google-api-core, googleapis-common-protos, grpc-google-iam-v1
@@ -39,32 +39,33 @@ packaging==20.1           # via pytest
 paramiko==2.7.1           # via docker
 pluggy==0.13.1            # via pytest
 protobuf==3.11.3          # via google-api-core, googleapis-common-protos
-psycopg2-binary==2.8.4
+psycopg2-binary==2.8.4    # via testcontainers
 py==1.8.1                 # via pytest
 pyasn1-modules==0.2.8     # via google-auth
 pyasn1==0.4.8             # via pyasn1-modules, rsa
 pycodestyle==2.5.0        # via flake8
 pycparser==2.19           # via cffi
 pyflakes==2.1.1           # via flake8
-pymongo==3.10.1
-pymysql==0.9.3
+pymongo==3.10.1           # via testcontainers
+pymysql==0.9.3            # via testcontainers
 pynacl==1.3.0             # via paramiko
 pyparsing==2.4.6          # via packaging
 pyrsistent==0.15.7        # via jsonschema
-pytest-cov==2.8.1
-pytest==5.3.5
+pytest-cov==2.8.1         # via -r requirements.in
+pytest==5.3.5             # via -r requirements.in, pytest-cov
 pytz==2019.3              # via google-api-core
 pyyaml==5.3               # via docker-compose
+redis==3.4.1              # via testcontainers
 requests==2.23.0          # via codecov, docker, docker-compose, google-api-core
 rsa==4.0                  # via google-auth
-selenium==3.141.0
+selenium==3.141.0         # via testcontainers
 six==1.14.0               # via bcrypt, cryptography, docker, docker-compose, dockerpty, google-api-core, google-auth, grpcio, jsonschema, packaging, protobuf, pynacl, pyrsistent, websocket-client
-sqlalchemy==1.3.13
+sqlalchemy==1.3.13        # via testcontainers
 texttable==1.6.2          # via docker-compose
 urllib3==1.25.8           # via requests, selenium
 wcwidth==0.1.8            # via pytest
 websocket-client==0.57.0  # via docker, docker-compose
-wrapt==1.12.0
+wrapt==1.12.0             # via testcontainers
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

setup.py

@@ -54,7 +54,8 @@
         'postgresql': ['sqlalchemy', 'psycopg2-binary'],
         'selenium': ['selenium'],
         'google-cloud-pubsub': ['google-cloud-pubsub'],
-        'mongo': ['pymongo']
+        'mongo': ['pymongo'],
+        'redis': ['redis']
     },
     long_description_content_type="text/markdown",
     long_description=long_description,

testcontainers/redis.py

@@ -10,11 +10,28 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import redis as redis
+
 from testcontainers.core.container import DockerContainer
+from testcontainers.core.waiting_utils import wait_container_is_ready
 
 
 class RedisContainer(DockerContainer):
     def __init__(self, image="redis:latest", port_to_expose=6379):
         super(RedisContainer, self).__init__(image)
         self.port_to_expose = port_to_expose
         self.with_exposed_ports(self.port_to_expose)
+
+    @wait_container_is_ready()
+    def _connect(self):
+        client = self.get_client()
+        if not client.ping():
+            raise Exception
+
+    def get_client(self):
+        return redis.Redis(host=self.get_container_host_ip(), port=self.get_exposed_port(6379))
+
+    def start(self):
+        super().start()
+        self._connect()
+        return self