Skip to content

Commit 383b12e

Browse files
committed
Use relative imports in core package.
1 parent 49d2516 commit 383b12e

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

core/testcontainers/core/container.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import os
22
from docker.models.containers import Container
33

4-
from testcontainers.core.waiting_utils import wait_container_is_ready
5-
from testcontainers.core.docker_client import DockerClient
6-
from testcontainers.core.exceptions import ContainerStartException
7-
from testcontainers.core.utils import setup_logger, inside_container, is_arm
4+
from .waiting_utils import wait_container_is_ready
5+
from .docker_client import DockerClient
6+
from .exceptions import ContainerStartException
7+
from .utils import setup_logger, inside_container, is_arm
88

99
logger = setup_logger(__name__)
1010

core/testcontainers/core/docker_client.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
from docker.errors import NotFound
1818
from docker.models.containers import Container
1919

20-
from testcontainers.core.utils import inside_container
21-
from testcontainers.core.utils import default_gateway_ip
22-
from testcontainers.core.utils import setup_logger
20+
from .utils import default_gateway_ip, inside_container, setup_logger
2321

2422

2523
LOGGER = setup_logger(__name__)

core/testcontainers/core/exceptions.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@
1212
# under the License.
1313

1414

15-
class ContainerStartException(Exception):
16-
pass
17-
18-
19-
class TimeoutException(Exception):
20-
pass
21-
22-
23-
class NoSuchBrowserException(Exception):
15+
class ContainerStartException(RuntimeError):
2416
pass
2517

2618

core/testcontainers/core/generic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
# License for the specific language governing permissions and limitations
1212
# under the License.
1313

14-
from testcontainers.core.container import DockerContainer
15-
from testcontainers.core.waiting_utils import wait_container_is_ready
16-
ADDITIONAL_TRANSIENT_ERRORS = []
14+
from .container import DockerContainer
15+
from .waiting_utils import wait_container_is_ready
1716

17+
ADDITIONAL_TRANSIENT_ERRORS = []
1818
try:
1919
from sqlalchemy.exc import DBAPIError
2020
ADDITIONAL_TRANSIENT_ERRORS.append(DBAPIError)

core/testcontainers/core/waiting_utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818

1919
import wrapt
2020

21-
from testcontainers.core import config
22-
from testcontainers.core.exceptions import TimeoutException
23-
from testcontainers.core.utils import setup_logger
21+
from . import config
22+
from .utils import setup_logger
2423

2524
logger = setup_logger(__name__)
2625

@@ -59,7 +58,7 @@ def wrapper(wrapped, instance, args, kwargs):
5958
f"failed: {traceback.format_exc()}")
6059
time.sleep(config.SLEEP_TIME)
6160
exception = e
62-
raise TimeoutException(
61+
raise TimeoutError(
6362
f'Wait time ({config.MAX_TRIES * config.SLEEP_TIME}s) exceeded for {wrapped.__name__}'
6463
f'(args: {args}, kwargs {kwargs}). Exception: {exception}'
6564
)

0 commit comments

Comments
 (0)