Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions pytest_localstack/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def session_fixture(
kinesis_error_probability=0.0,
dynamodb_error_probability=0.0,
container_log_level=logging.DEBUG,
localstack_image="localstack/localstack",
localstack_version="latest",
auto_remove=True,
pull_image=True,
Expand Down Expand Up @@ -95,6 +96,8 @@ def session_fixture(
DynamoDB API responses.
container_log_level (int, optional): The logging level to use
for Localstack container logs. Defaults to :data:`logging.DEBUG`.
localstack_image (str, optional): The Docker image of Localstack
to use. Defaults to :const:`"localstack/localstack"`.
localstack_version (str, optional): The version of the Localstack
image to use. Defaults to :const:`"latest"`.
auto_remove (bool, optional): If :obj:`True`, delete the Localstack
Expand Down Expand Up @@ -122,6 +125,7 @@ def _fixture(pytestconfig):
kinesis_error_probability=kinesis_error_probability,
dynamodb_error_probability=dynamodb_error_probability,
container_log_level=container_log_level,
localstack_image=localstack_image,
localstack_version=localstack_version,
auto_remove=auto_remove,
pull_image=pull_image,
Expand Down
4 changes: 4 additions & 0 deletions pytest_localstack/contrib/botocore.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ def patch_fixture(
kinesis_error_probability=0.0,
dynamodb_error_probability=0.0,
container_log_level=logging.DEBUG,
localstack_image="localstack/localstack",
localstack_version="latest",
auto_remove=True,
pull_image=True,
Expand Down Expand Up @@ -370,6 +371,8 @@ def patch_fixture(
DynamoDB API responses.
container_log_level (int, optional): The logging level to use
for Localstack container logs. Defaults to :data:`logging.DEBUG`.
localstack_image (str, optional): The Docker image of Localstack
to use. Defaults to :const:`"localstack/localstack"`.
localstack_version (str, optional): The version of the Localstack
image to use. Defaults to :const:`"latest"`.
auto_remove (bool, optional): If :obj:`True`, delete the Localstack
Expand Down Expand Up @@ -397,6 +400,7 @@ def _fixture(pytestconfig):
kinesis_error_probability=kinesis_error_probability,
dynamodb_error_probability=dynamodb_error_probability,
container_log_level=container_log_level,
localstack_image=localstack_image,
localstack_version=localstack_version,
auto_remove=auto_remove,
pull_image=pull_image,
Expand Down
7 changes: 5 additions & 2 deletions pytest_localstack/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ class LocalstackSession(RunningSession):
DynamoDB API responses.
container_log_level (int, optional): The logging level to use
for Localstack container logs. Defaults to :attr:`logging.DEBUG`.
localstack_image (str, optional): The Docker image of Localstack
to use. Defaults to `localstack/localstack`.
localstack_version (str, optional): The version of the Localstack
image to use. Defaults to `latest`.
auto_remove (bool, optional): If True, delete the Localstack
Expand All @@ -216,7 +218,6 @@ class LocalstackSession(RunningSession):

"""

image_name = "localstack/localstack"
factories = []

def __init__(
Expand All @@ -227,6 +228,7 @@ def __init__(
kinesis_error_probability=0.0,
dynamodb_error_probability=0.0,
container_log_level=logging.DEBUG,
localstack_image="localstack/localstack",
localstack_version="latest",
auto_remove=True,
pull_image=True,
Expand All @@ -253,6 +255,7 @@ def __init__(
)

self.container_log_level = container_log_level
self.localstack_image = localstack_image
self.localstack_version = localstack_version
self.container_name = container_name or generate_container_name()

Expand All @@ -277,7 +280,7 @@ def start(self, timeout=60):
logger.debug("%r running starting hooks", self)
plugin.manager.hook.session_starting(session=self)

image_name = self.image_name + ":" + self.localstack_version
image_name = self.localstack_image + ":" + self.localstack_version
if self.pull_image:
logger.debug("Pulling docker image %r", image_name)
self.docker_client.images.pull(image_name)
Expand Down