Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
nomagick committed Nov 29, 2022
1 parent e9b310a commit 90be456
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions tests/docker_cases/Dockerfile.case2
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=jinahub/dockerfile:1.4.3-magic-shell
FROM jinaai/jina:2.0-perf

COPY . /workspace
Expand Down
1 change: 1 addition & 0 deletions tests/docker_cases/Dockerfile.case2.expect
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=jinahub/dockerfile:1.4.3-magic-shell
FROM jinaai/jina:2.0-perf

COPY . /workspace
Expand Down
13 changes: 9 additions & 4 deletions tests/test_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,32 @@ def test_baseimage(exe_dockerfile):


@pytest.mark.parametrize(
'docker_file, docker_expect_file',
'docker_file, docker_expect_file, dockerfile_syntax',
[
(
Path(__file__).parent / 'docker_cases' / 'Dockerfile.case1',
Path(__file__).parent / 'docker_cases' / 'Dockerfile.case1.expect'
Path(__file__).parent / 'docker_cases' / 'Dockerfile.case1.expect',
None
),
(
Path(__file__).parent / 'docker_cases' / 'Dockerfile.case2',
Path(__file__).parent / 'docker_cases' / 'Dockerfile.case2.expect'
Path(__file__).parent / 'docker_cases' / 'Dockerfile.case2.expect',
'jinahub/dockerfile:1.4.3-magic-shell'
)
],
)
def test_load_dockerfile(docker_file, docker_expect_file):
def test_load_dockerfile(docker_file, docker_expect_file, dockerfile_syntax):

parser = ExecutorDockerfile(docker_file=docker_file)

expect_parser = ExecutorDockerfile(docker_file=docker_expect_file)

assert str(parser) == str(expect_parser)

assert parser.syntax == expect_parser.syntax
assert expect_parser.syntax == expect_parser.syntax

assert len(parser.parent_images) == 1
assert parser.baseimage == 'jinaai/jina:2.0-perf'
assert parser.entrypoint == '["jina", "executor", "--uses", "config.yml"]'
Expand Down

0 comments on commit 90be456

Please sign in to comment.