From ca3872e4b59b3111b963f01a0dfb5f895f5a18b7 Mon Sep 17 00:00:00 2001 From: ninjinkun Date: Tue, 14 Jun 2022 11:26:31 +0900 Subject: [PATCH 1/2] feature: change default mode to `record_only` --- launchable_cli_args/subset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchable_cli_args/subset.py b/launchable_cli_args/subset.py index 502b470..817a13b 100755 --- a/launchable_cli_args/subset.py +++ b/launchable_cli_args/subset.py @@ -17,7 +17,7 @@ def fill_and_validate(self, data: dict, error_counter: ErrorCounter): if data is None: error_counter.record("subset section is empty") else: - self.mode: str = data.get("mode", "subset") + self.mode: str = data.get("mode", "record_only") if not self.mode in ["subset", "subset_and_rest", "record_only"]: error_counter.record( "'mode' must be subset, subset_and_rest, or record_only") From 3d3680d88c2fd13a02caa11f7e0b9f1b7eaa6ab1 Mon Sep 17 00:00:00 2001 From: ninjinkun Date: Tue, 14 Jun 2022 11:44:50 +0900 Subject: [PATCH 2/2] feature: change option names to hyphenated --- launchable_cli_args/subset.py | 12 ++++++------ pytest_launchable/launchable_test_context.py | 2 +- tests/test_configure.py | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/launchable_cli_args/subset.py b/launchable_cli_args/subset.py index 817a13b..69736c0 100755 --- a/launchable_cli_args/subset.py +++ b/launchable_cli_args/subset.py @@ -17,10 +17,10 @@ def fill_and_validate(self, data: dict, error_counter: ErrorCounter): if data is None: error_counter.record("subset section is empty") else: - self.mode: str = data.get("mode", "record_only") - if not self.mode in ["subset", "subset_and_rest", "record_only"]: + self.mode: str = data.get("mode", "record-only") + if not self.mode in ["subset", "subset-and-rest", "record-only"]: error_counter.record( - "'mode' must be subset, subset_and_rest, or record_only") + "'mode' must be subset, subset-and-rest, or record-only") self.target: Optional[str] = data.get("target", None) self.confidence: Optional[int] = data.get("confidence", None) self.time: Optional[int] = data.get("time", None) @@ -29,7 +29,7 @@ def fill_and_validate(self, data: dict, error_counter: ErrorCounter): "one of target/confidence/time must be specified") def write_to(self, writer: YamlWriter): - writer.comment("mode is subset, subset_and_rest, or record_only") + writer.comment("mode is subset, subset-and-rest, or record-only") writer.name("mode").value(self.mode) writer.comment("you must specify one of target/confidence/time") @@ -47,7 +47,7 @@ def write_to(self, writer: YamlWriter): writer.name("time").value(self.time) def to_command(self) -> "Commands": - if self.mode == "record_only": + if self.mode == "record-only": return () # subset command is not applicable else: a: "Commands" = ("launchable", "subset", "--build", @@ -59,7 +59,7 @@ def to_command(self) -> "Commands": if getattr(self, "time", None) is not None: a += ("--time", self.time) - if self.mode == "subset_and_rest": + if self.mode == "subset-and-rest": a += ("--rest", SubsetArgs.REST_FILE_NAME) a += ("pytest", ) diff --git a/pytest_launchable/launchable_test_context.py b/pytest_launchable/launchable_test_context.py index c9e727c..0975914 100755 --- a/pytest_launchable/launchable_test_context.py +++ b/pytest_launchable/launchable_test_context.py @@ -304,7 +304,7 @@ def pytest_collection_modifyitems(config, items: List[pytest.Function]) -> None: lc.set_subset_command_request(subset_command, testpath_list) raw_subset_result = subprocess.run(subset_command, input="\r\n".join( testpath_list), stdout=subprocess.PIPE, text=True) - if cli.subset.mode == "subset_and_rest": + if cli.subset.mode == "subset-and-rest": lc.set_subset_command_response( raw_subset_result.stdout, cli.subset.REST_FILE_NAME) else: diff --git a/tests/test_configure.py b/tests/test_configure.py index 4140983..c1dd7b1 100755 --- a/tests/test_configure.py +++ b/tests/test_configure.py @@ -26,11 +26,11 @@ def test_command() -> None: assert args.subset.to_command() == ("launchable", "subset", "--build", "XXX", "--target", "30%", "pytest") - # subset_and_rest mode - args.subset.mode = "subset_and_rest" + # subset-and-rest mode + args.subset.mode = "subset-and-rest" assert args.subset.to_command() == ("launchable", "subset", "--build", "XXX", "--target", "30%", "--rest", args.subset.REST_FILE_NAME, "pytest") - # record_only mode / skip subset service, record test command only - args.subset.mode = "record_only" + # record-only mode / skip subset service, record test command only + args.subset.mode = "record-only" assert args.subset.to_command() == ()