Skip to content
This repository was archived by the owner on Aug 4, 2023. It is now read-only.

Commit 2464c06

Browse files
committed
Moved fixture docker_client_config to conftest.
1 parent 67ed573 commit 2464c06

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

tests/conftest.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import yaml
77
import pytest
88

9+
from gcip.addons.container.config import DockerClientConfig
10+
911

1012
def check(output: Dict[str, Any]) -> None:
1113
yaml_output = yaml.safe_dump(output, default_flow_style=False, sort_keys=False)
@@ -58,3 +60,11 @@ def gitlab_ci_environment_variables(monkeypatch):
5860
monkeypatch.setenv("CI_COMMIT_REF_NAME", "my_awsome_feature_branch")
5961
monkeypatch.setenv("CI_COMMIT_TAG", "11.22.33")
6062
monkeypatch.setenv("CI_PROJECT_DIR", "/path/to/project")
63+
64+
65+
@pytest.fixture()
66+
def docker_client_config() -> DockerClientConfig:
67+
dcc = DockerClientConfig()
68+
dcc.add_auth(registry="index.docker.io")
69+
dcc.add_cred_helper("0132456789.dkr.eu-central-1.amazonaws.com", cred_helper="ecr-login")
70+
return dcc

tests/unit/test_addons_container_crane.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
1-
import pytest
2-
31
from gcip import Pipeline
42
from tests import conftest
53
from gcip.core.image import Image
64
from gcip.addons.container.jobs import crane
7-
from gcip.addons.container.config import DockerClientConfig
85
from gcip.addons.container.registries import Registry
96

107

11-
@pytest.fixture()
12-
def docker_client_config() -> DockerClientConfig:
13-
dcc = DockerClientConfig()
14-
dcc.add_auth(registry="index.docker.io")
15-
dcc.add_cred_helper("0132456789.dkr.eu-central-1.amazonaws.com", cred_helper="ecr-login")
16-
return dcc
17-
18-
198
def test_simple_crane_copy_job(gitlab_ci_environment_variables):
209
pipeline = Pipeline()
2110

0 commit comments

Comments
 (0)