Skip to content

Commit 59ed616

Browse files
committed
fixes to tests and api
1 parent 2bdcd1d commit 59ed616

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

localstack_utils/container.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ def wait_for_ready(container, pattern):
7171
attempts += 1
7272

7373
if attempts >= MAX_LOG_COLLECTION_ATTEMPTS:
74-
raise "Could not find token: " + pattern.toString() + "in logs"
74+
raise RuntimeError(f"Could not find token: {pattern.pattern} in logs")

localstack_utils/localstack.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import re
2-
import sys
32
import docker
43
import logging
54
from localstack_utils.container import Container
@@ -41,14 +40,13 @@ def startup(self, docker_configuration):
4140

4241
try:
4342
self.localstack_container = Container.create_localstack_container(
44-
docker_configuration.pull_new_image,
45-
docker_configuration.image_name,
46-
docker_configuration.image_tag,
47-
docker_configuration.gateway_listen,
48-
docker_configuration.environment_variables,
49-
docker_configuration.port_mappings,
50-
docker_configuration.pro,
51-
docker_configuration.auto_remove_container,
43+
pull_new_image=docker_configuration.pull_new_image,
44+
image_name=docker_configuration.image_name,
45+
image_tag=docker_configuration.image_tag,
46+
gateway_listen=docker_configuration.gateway_listen,
47+
auto_remove=docker_configuration.auto_remove_container,
48+
environment_variables=docker_configuration.environment_variables,
49+
bind_ports=docker_configuration.port_mappings,
5250
)
5351

5452
self.setup_logger()
@@ -57,10 +55,10 @@ def startup(self, docker_configuration):
5755

5856
except docker.errors.APIError:
5957
if not docker_configuration.ignore_docker_runerrors:
60-
raise "Unable to start docker"
58+
raise RuntimeError("Unable to start docker")
6159

6260
except Exception:
63-
raise sys.exc_info()
61+
raise
6462

6563
def stop(self):
6664
self.localstack_container.stop()

0 commit comments

Comments
 (0)