Skip to content

Commit afe5c56

Browse files
committed
Remove CRATEDB_DB as cratedb does not support different 'databases'
1 parent 772a812 commit afe5c56

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

modules/cratedb/testcontainers/cratedb/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ def __init__(
7272
to the 15432 port on the host.
7373
:param user: optional username to access the DB; if None, try `CRATEDB_USER` environment variable
7474
:param password: optional password to access the DB; if None, try `CRATEDB_PASSWORD` environment variable
75-
:param dbname: optional database name to access the DB; if None, try `CRATEDB_DB` environment variable
7675
:param cmd_opts: an optional dict with CLI arguments to be passed to the DB entrypoint inside the container
7776
:param kwargs: misc keyword arguments
7877
"""
@@ -82,7 +81,6 @@ def __init__(
8281

8382
self.CRATEDB_USER = user or os.environ.get("CRATEDB_USER", "crate")
8483
self.CRATEDB_PASSWORD = password or os.environ.get("CRATEDB_PASSWORD", "crate")
85-
self.CRATEDB_DB = dbname or os.environ.get("CRATEDB_DB", "doc")
8684

8785
self.port_mapping = ports if ports else {4200: None}
8886
self.port_to_expose = next(iter(self.port_mapping.items()))
@@ -124,7 +122,6 @@ def _configure_ports(self) -> None:
124122
def _configure_credentials(self) -> None:
125123
self.with_env("CRATEDB_USER", self.CRATEDB_USER)
126124
self.with_env("CRATEDB_PASSWORD", self.CRATEDB_PASSWORD)
127-
self.with_env("CRATEDB_DB", self.CRATEDB_DB)
128125

129126
def _configure(self) -> None:
130127
self._configure_ports()
@@ -145,7 +142,6 @@ def get_connection_url(self, dialect: str = "crate", host: t.Optional[str] = Non
145142
password=self.CRATEDB_PASSWORD,
146143
host=host,
147144
port=self.port_to_expose[0],
148-
dbname=self.CRATEDB_DB,
149145
)
150146

151147
def _create_connection_url(

modules/cratedb/tests/test_cratedb.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ def test_docker_run_cratedb_ports(ports, expected):
3434

3535

3636
def test_docker_run_cratedb_credentials():
37-
expected_user, expected_password, expected_db, expected_port = "user1", "pass1", "host1", 4200
37+
expected_user, expected_password, expected_port = "user1", "pass1", 4200
3838
expected_default_dialect, expected_default_host = "crate", "localhost"
3939
expected_defined_dialect, expected_defined_host = "somedialect", "somehost"
4040
os.environ["CRATEDB_USER"], os.environ["CRATEDB_PASSWORD"] = expected_user, expected_password
41-
os.environ["CRATEDB_DB"] = expected_db
4241

4342
with CrateDBContainer("crate:latest", ports={4200: expected_port}) as container:
4443
url = urllib.parse.urlparse(container.get_connection_url())
@@ -49,7 +48,6 @@ def test_docker_run_cratedb_credentials():
4948
assert url.scheme == expected_default_dialect
5049
assert host == expected_default_host
5150
assert int(port) == expected_port
52-
assert url.path.replace("/", "") == expected_db
5351

5452
url = urllib.parse.urlparse(
5553
container.get_connection_url(dialect=expected_defined_dialect, host=expected_defined_host)

0 commit comments

Comments
 (0)