Skip to content

refactor: moves docker makefile into docker folder. #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artanias merged 1 commit into from
Jan 4, 2025
Merged

refactor: moves docker makefile into docker folder. #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,5 @@ help-general:
.EXPORT_ALL_VARIABLES:
.PHONY: all test man

include docker.mk
include docker/docker.mk
include locales/i18n.mk
0 docker.mk → docker/docker.mk
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docker/test_ubuntu2204.dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ADD README.md /usr/src/@UTIL_NAME@/README.md
ADD LICENSE /usr/src/@UTIL_NAME@/LICENSE
ADD Makefile /usr/src/@UTIL_NAME@/Makefile
ADD locales/ /usr/src/@UTIL_NAME@/locales
ADD docker.mk /usr/src/@UTIL_NAME@/docker.mk
ADD docker/docker.mk /usr/src/@UTIL_NAME@/docker/docker.mk
ADD debian/ /usr/src/@UTIL_NAME@/debian

CMD make test
2 changes: 1 addition & 1 deletion docker/ubuntu2204.dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ADD README.md /usr/src/@UTIL_NAME@/README.md
ADD LICENSE /usr/src/@UTIL_NAME@/LICENSE
ADD Makefile /usr/src/@UTIL_NAME@/Makefile
ADD locales/i18n.mk /usr/src/@UTIL_NAME@/locales/i18n.mk
ADD docker.mk /usr/src/@UTIL_NAME@/docker.mk
ADD docker/docker.mk /usr/src/@UTIL_NAME@/docker/docker.mk
ADD @DEBIAN_PACKAGES_PATH@ /usr/src/@UTIL_NAME@/@DEBIAN_PACKAGES_PATH@

RUN apt-get install -y /usr/src/@UTIL_NAME@/@DEBIAN_PACKAGES_PATH@/@[email protected]
Expand Down
22 changes: 14 additions & 8 deletions test/auto/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,32 @@

@pytest.fixture
def create_reports_folder():
with suppress(Exception):
os.mkdir(REPORTS_FOLDER)
assert os.path.exists(REPORTS_FOLDER)
__create_reports_folder()

yield

shutil.rmtree(REPORTS_FOLDER)
__remove_reports_folder()


@pytest.fixture(scope="module")
def create_reports_folder_module():
with suppress(Exception):
os.mkdir(REPORTS_FOLDER)
assert os.path.exists(REPORTS_FOLDER)
__create_reports_folder()

yield

shutil.rmtree(REPORTS_FOLDER)
__remove_reports_folder()


@pytest.fixture(scope="session", autouse=True)
def set_logging_level():
modify_settings(log_level="debug")


def __create_reports_folder() -> None:
with suppress(Exception):
os.mkdir(REPORTS_FOLDER)
assert os.path.exists(REPORTS_FOLDER)


def __remove_reports_folder() -> None:
shutil.rmtree(REPORTS_FOLDER)
4 changes: 2 additions & 2 deletions test/auto/functional/test_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def test_compare_cpp_files(cmd: list[str], out: bytes, found_plag: bool):
result = run_check(cmd, extension="cpp")

if found_plag:
result.assert_found_plagiarism()
result.assert_found_similarity()
else:
result.assert_success()
assert out in result.cmd_res.stdout
Expand Down Expand Up @@ -119,7 +119,7 @@ def test_compare_py_files(cmd: list[str], out: bytes, found_plag: bool):
result = run_check(cmd)

if found_plag:
result.assert_found_plagiarism()
result.assert_found_similarity()
else:
result.assert_success()
assert out in result.cmd_res.stdout
Expand Down
2 changes: 1 addition & 1 deletion test/auto/functional/test_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def setup(create_reports_folder_module: None):
modify_settings(
reports=REPORTS_FOLDER, reports_extension="csv", short_output=1
).assert_success()
run_check(["--directories", "test/unit/codeplag/cplag", "src/"]).assert_found_plagiarism()
run_check(["--directories", "test/unit/codeplag/cplag", "src/"]).assert_found_similarity()

yield

Expand Down
2 changes: 1 addition & 1 deletion test/auto/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def assert_success(self: Self) -> None:
def assert_failed(self: Self) -> None:
assert self.cmd_res.returncode, str(self.cmd_res)

def assert_found_plagiarism(self: Self) -> None:
def assert_found_similarity(self: Self) -> None:
assert self.cmd_res.returncode == ExitCode.EXIT_FOUND_SIM, str(self.cmd_res)


Expand Down
Loading