Fix OracleDbContainer (#41)

Author: mbode

Pipfile

@@ -21,3 +21,4 @@ sqlalchemy = "*"
 pymysql = "*"
 google-cloud-pubsub = "*"
 psycopg2-binary = "*"
+cx-oracle = "*"

Pipfile.lock

@@ -13,6 +13,7 @@ Currently available features:
 * Selenium Standalone containers
 * MySql Db container
 * MariaDb container
+* OracleDb container
 * PostgreSQL Db container
 * Generic docker containers
 
@@ -28,6 +29,7 @@ The **testcontainers** module is available from PyPI at:
 and can be installed using ``pip``, depending on which containers you need:
 
     pip install testcontainers[mysql]
+    pip install testcontainers[oracle]
     pip install testcontainers[postgresql]
     pip install testcontainers[selenium]
     # or with multiple

README.md

@@ -54,13 +54,16 @@ Oracle XE
     oracle = OracleDbContainer()
 
     with oracle:
-        e = sqlalchemy.create_engine(mysql.get_connection_url())
+        e = sqlalchemy.create_engine(oracle.get_connection_url())
         result = e.execute("select 1 from dual")
 
-It uses **https://hub.docker.com/r/wnameless/oracle-xe-11g/** docker image.
+It uses **https://hub.docker.com/r/wnameless/oracle-xe-11g-r2/** docker image.
 
-Connection detail for Oracle DB.
+Necessary to use it:
 
+- ``cx_Oracle``
+- `Oracle client libraries <https://cx-oracle.readthedocs.io/en/latest/user_guide/installation.html>`_
+=======
 ::
 
     hostname: localhost
@@ -77,3 +80,4 @@ Elasticsearch
     es = ElasticSearchContainer()
     with es:
         es.get_url()  # gives you the http URL to connect to Elasticsearch
+

docs/database.rst

@@ -12,6 +12,7 @@ Currently available features:
 
 - Selenim Standalone containers
 - MySql db container
+- Oracle db container
 - PostgreSQL db container
 - Google Cloud PubSub emulator container
 - Elasticsearch container
@@ -28,6 +29,7 @@ and can be installed using pip, depending on which containers you need:
 ::
 
    pip install testcontainers[mysql]
+   pip install testcontainers[oracle]
    pip install testcontainers[postgresql]
    pip install testcontainers[selenium]
    pip install testcontainers[google-cloud-pubsub]

docs/index.rst

@@ -49,6 +49,7 @@
     extras_require={
         'docker-compose': ['docker-compose'],
         'mysql': ['sqlalchemy', 'pymysql'],
+        'oracle': ['sqlalchemy', 'cx_Oracle'],
         'postgresql': ['sqlalchemy', 'psycopg2-binary'],
         'selenium': ['selenium==2.53.1'],
         'google-cloud-pubsub': ['google-cloud-pubsub'],

setup.py

@@ -2,18 +2,17 @@
 
 
 class OracleDbContainer(DbContainer):
-    def __init__(self, image="wnameless/oracle-xe-11g:latest"):
-        super(OracleDbContainer, self).__init__(image=image,
-                                                username="system",
-                                                password="oracle",
-                                                db_name="xe",
-                                                dialect="oracle",
-                                                port=1521)
-        self.host_port = 49161
+    def __init__(self, image="wnameless/oracle-xe-11g-r2:latest"):
+        super(OracleDbContainer, self).__init__(image=image)
         self.container_port = 1521
-        self.host_ssh_port = 49160
-        self.container_ssh_port = 22
-        self.dialect = "oracle"
+        self.with_exposed_ports(self.container_port)
 
     def _configure(self):
         self.with_env("ORACLE_ALLOW_REMOTE", "true")
+
+    def get_connection_url(self):
+        return super()._create_connection_url(dialect="oracle",
+                                              username="system",
+                                              password="oracle",
+                                              port=self.container_port,
+                                              db_name="xe")

testcontainers/oracle.py

@@ -1,9 +1,11 @@
+import pytest
 import sqlalchemy
 from pymongo import MongoClient
 
 from testcontainers.core.generic import GenericContainer
-from testcontainers.core.waiting_utils import  wait_for
+from testcontainers.core.waiting_utils import wait_for
 from testcontainers.mysql import MySqlContainer, MariaDbContainer
+from testcontainers.oracle import OracleDbContainer
 from testcontainers.postgres import PostgresContainer
 
 
@@ -34,6 +36,20 @@ def test_docker_run_mariadb():
             assert row[0] == '10.2.9-MariaDB-10.2.9+maria~jessie'
 
 
+@pytest.mark.skip(reason="needs oracle client libraries unavailable on Travis")
+def test_docker_run_oracle():
+    oracledb_container = OracleDbContainer()
+    with oracledb_container as oracledb:
+        e = sqlalchemy.create_engine(oracledb.get_connection_url())
+        result = e.execute("select * from V$VERSION")
+        versions = {'Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production',
+                    'PL/SQL Release 11.2.0.2.0 - Production',
+                    'CORE\t11.2.0.2.0\tProduction',
+                    'TNS for Linux: Version 11.2.0.2.0 - Production',
+                    'NLSRTL Version 11.2.0.2.0 - Production'}
+        assert {row[0] for row in result} == versions
+
+
 def test_docker_generic_db():
     mongo_container = GenericContainer("mongo:latest")
     mongo_container.with_bind_ports(27017, 27017)