Skip to content

Add new Mosquitto version 2.1.2 to tests #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
f18m wants to merge 9 commits into from
Closed

Add new Mosquitto version 2.1.2 to tests #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d2b49e
Add clickhouse-connect dependency
pofl Mar 12, 2023
c9a2dd0
Enable using HTTP port
pofl Mar 12, 2023
9a3c217
Adjust doctest
pofl Mar 12, 2023
de8502a
Repair import
pofl Mar 12, 2023
564ce66
Handle all connect errors
pofl Mar 12, 2023
cc4e563
Reformat doctest
pofl Mar 12, 2023
8682063
Revert some accidental changes
pofl Mar 12, 2023
04e999c
Add type
pofl Mar 12, 2023
fcc6cce
fixed linting clickhouse container and fixed doctest
pffijt Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clickhouse/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
url="https://github.com/testcontainers/testcontainers-python",
install_requires=[
"testcontainers-core",
"clickhouse-connect",
"clickhouse-driver",
],
python_requires=">=3.7",
Expand Down
28 changes: 20 additions & 8 deletions clickhouse/testcontainers/clickhouse/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
import os
from typing import Optional

import clickhouse_connect
from clickhouse_connect.driver.exceptions import Error as ClickhouseConnectError
import clickhouse_driver
from clickhouse_driver.errors import Error
from clickhouse_driver.errors import Error as ClickhouseDriverError

from testcontainers.core.generic import DbContainer
from testcontainers.core.waiting_utils import wait_container_is_ready
Expand All @@ -25,19 +27,25 @@ class ClickHouseContainer(DbContainer):
ClickHouse database container.

Example:

The example spins up a ClickHouse database and connects to it using the
:code:`clickhouse-driver`.
The example spins up a ClickHouse database and connects to it
using the :code:`clickhouse-driver`.

.. doctest::

>>> import clickhouse_driver
>>> from testcontainers.clickhouse import ClickHouseContainer

>>> import clickhouse_driver
>>> with ClickHouseContainer("clickhouse/clickhouse-server:21.8") as clickhouse:
... client = clickhouse_driver.Client.from_url(clickhouse.get_connection_url())
... client.execute("select 'working'")
[('working',)]

>>> import clickhouse_connect
>>> with ClickHouseContainer("clickhouse/clickhouse-server:21.8",
... port=8123) as clickhouse:
... client = clickhouse_connect.get_client(dsn=clickhouse.get_connection_url())
... client.command("select 'working'")
'working'
"""

CLICKHOUSE_USER = os.environ.get("CLICKHOUSE_USER", "test")
Expand All @@ -60,10 +68,14 @@ def __init__(
self.port_to_expose = port
self.with_exposed_ports(self.port_to_expose)

@wait_container_is_ready(Error, EOFError)
@wait_container_is_ready(ClickhouseDriverError, ClickhouseConnectError, EOFError)
def _connect(self) -> None:
with clickhouse_driver.Client.from_url(self.get_connection_url()) as client:
client.execute("SELECT version()")
if self.port_to_expose == 8123:
with clickhouse_connect.get_client(dsn=self.get_connection_url()) as client:
client.command("SELECT version()")
else:
with clickhouse_driver.Client.from_url(self.get_connection_url()) as client:
client.execute("SELECT version()")

def _configure(self) -> None:
self.with_env("CLICKHOUSE_USER", self.CLICKHOUSE_USER)
Expand Down