Skip to content

Commit

Permalink
rm redundant tests
Browse files Browse the repository at this point in the history
Signed-off-by: Evedel <svbiriukov@gmail.com>
  • Loading branch information
Evedel authored and muayyad-alsadi committed Aug 2, 2023
1 parent bc9168b commit 06587c1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion podman_compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -1627,7 +1627,7 @@ def _parse_compose_file(self):
compose.get("services", {}), set(args.profile)
)
compose["services"] = resolved_services
if not args.no_normalize:
if not getattr(args, "no_normalize", None):
compose = normalize_final(compose, self.dirname)
self.merged_yaml = yaml.safe_dump(compose)
merged_json_b = json.dumps(compose, separators=(",", ":")).encode("utf-8")
Expand Down
19 changes: 0 additions & 19 deletions pytests/test_normalize_final_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,6 @@
]


#
# [service.build] is not normalised before coompose files are merged
#
def test_pre_merge_normalize_service_does_not_affect_build_section() -> None:
for test_input, _ in copy.deepcopy(test_cases_simple_normalization):
expected_service = copy.deepcopy(test_input)
actual_service = normalize_service(test_input)
assert expected_service == actual_service


def test_pre_merge_normalize_does_not_affect_build_section() -> None:
for test_input, _ in copy.deepcopy(test_cases_simple_normalization):
expected_result = copy.deepcopy(test_input)
compose_test = {"services": {"test-service": test_input}}
compose_expected = {"services": {"test-service": expected_result}}
actual_compose = normalize(compose_test)
assert compose_expected == actual_compose


#
# [service.build] is normalised after merges
#
Expand Down

0 comments on commit 06587c1

Please sign in to comment.