[gentoo-commits] proj/portage:master commit in: lib/portage/tests/emerge/

["Sam James" <sam@gentoo.org>]

commit:     f539a071895d51aab15f8ae359150d8c638de0f9
Author:     David Palao <david.palao <AT> gmail <DOT> com>
AuthorDate: Fri Sep 29 15:58:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 03:14:24 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f539a071

tests/emerge/conftest.py: Add PortageCommandSequence

Add PortageCommandSequence. Some commands must run in sequence
to test some functionality of portage. This class has been added
to chain commands within a test.

Signed-off-by: David Palao <david.palao <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/tests/emerge/conftest.py | 124 +++++++++++++++++------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py b/lib/portage/tests/emerge/conftest.py
index 43fde441fd..27cca5e077 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -203,24 +203,27 @@ _BASELINE_COMMAND_SEQUENCE = [
     "emerge --info --verbose",
     "emerge --list-sets",
     "emerge --check-news",
-    # "rm -rf {cachedir}",
-    # "rm -rf {cachedir_pregen}",
-    "emerge --regen",
-    # "rm -rf {cachedir}",
-    "FEATURES=metadata-transfer emerge --regen",
-    # "rm -rf {cachedir}",
-    "FEATURES=metadata-transfer emerge --regen",  # is this second test case needed?
-    # "rm -rf {cachedir}",
-    "egencache --update",
-    "FEATURES=metadata-transfer emerge --metadata",
-    # "rm -rf {cachedir}",
-    "FEATURES=metadata-transfer emerge --metadata (2)",
-    "emerge --metadata",
-    # "rm -rf {cachedir}",
-    "emerge --oneshot virtual/foo",
-    # "foo pkg missing",
-    "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
-    # "foo pkg exists",
+    #
+    # # "rm -rf {cachedir}",
+    # # "rm -rf {cachedir_pregen}",
+    # "emerge --regen",
+    # # "rm -rf {cachedir}",
+    # "FEATURES=metadata-transfer emerge --regen",
+    # # "rm -rf {cachedir}",
+    # "FEATURES=metadata-transfer emerge --regen",  # is this second test case needed?
+    # # "rm -rf {cachedir}",
+    # "egencache --update",
+    # "FEATURES=metadata-transfer emerge --metadata",
+    # # "rm -rf {cachedir}",
+    # "FEATURES=metadata-transfer emerge --metadata (2)",
+    # "emerge --metadata",
+    # # "rm -rf {cachedir}",
+    # "emerge --oneshot virtual/foo",
+    # # "foo pkg missing",
+    # "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
+    # # "foo pkg exists",
+    "emerge --regen/--metadata",
+    #
     "emerge --pretend dev-libs/A",
     "ebuild dev-libs/A-1 manifest clean package merge",
     "emerge --pretend --tree --complete-graph dev-libs/A",
@@ -340,6 +343,14 @@ class PortageCommand:
             self.post_command()
 
 
+class PortageCommandSequence:
+    def __init__(self, *commands):
+        self.commands = commands
+
+    def __iter__(self):
+        yield from self.commands
+
+
 class Emerge(PortageCommand):
     name = "emerge"
     command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_bindir, name))
@@ -621,50 +632,39 @@ def _generate_all_baseline_commands(playground, binhost):
         _rm_cachedir()
         shutil.rmtree(cachedir_pregen)
 
-    test_commands["emerge --regen"] = Emerge(
-        "--regen", preparation=_rm_cachedir_and_pregen
-    )
-
-    test_commands["FEATURES=metadata-transfer emerge --regen"] = Emerge(
-        "--regen", env_mod={"FEATURES": "metadata-transfer"}, preparation=_rm_cachedir
-    )
-
-    test_commands["egencache --update"] = Egencache(
-        "--repo",
-        "test_repo",
-        "--repositories-configuration",
-        playground.settings.repositories.config_string(),
-        "--update",
-        *egencache_extra_args,
-        preparation=_rm_cachedir,
-    )
-
-    test_commands["FEATURES=metadata-transfer emerge --metadata"] = Emerge(
-        "--metadata", env_mod={"FEATURES": "metadata-transfer"}
-    )
-
-    test_commands["FEATURES=metadata-transfer emerge --metadata (2)"] = Emerge(
-        "--metadata",
-        env_mod={"FEATURES": "metadata-transfer"},
-        preparation=_rm_cachedir,
-    )
-
-    test_commands["emerge --metadata"] = Emerge("--metadata")
-
-    test_commands["emerge --oneshot virtual/foo"] = Emerge(
-        "--oneshot", "virtual/foo", preparation=_rm_cachedir
-    )
-
-    # test_commands["foo pkg missing"] = lambda: _check_foo_file(
-    #     pkgdir, foo_filename, must_exist=False
-    # )
-
-    test_commands["FEATURES=unmerge-backup emerge --unmerge virtual/foo"] = Emerge(
-        "--unmerge",
-        "virtual/foo",
-        env_mod={"FEATURES": "unmerge-backup"},
-        preparation=lambda: _check_foo_file(pkgdir, foo_filename, must_exist=False),
-    )
+    regen_seq = [
+        Emerge("--regen", preparation=_rm_cachedir_and_pregen),
+        Emerge(
+            "--regen",
+            env_mod={"FEATURES": "metadata-transfer"},
+            preparation=_rm_cachedir,
+        ),
+        Egencache(
+            "--repo",
+            "test_repo",
+            "--repositories-configuration",
+            playground.settings.repositories.config_string(),
+            "--update",
+            *egencache_extra_args,
+            preparation=_rm_cachedir,
+        ),
+        Emerge("--metadata", env_mod={"FEATURES": "metadata-transfer"}),
+        Emerge(
+            "--metadata",
+            env_mod={"FEATURES": "metadata-transfer"},
+            preparation=_rm_cachedir,
+        ),
+        Emerge("--metadata"),
+        Emerge("--oneshot", "virtual/foo", preparation=_rm_cachedir),
+        Emerge(
+            "--unmerge",
+            "virtual/foo",
+            env_mod={"FEATURES": "unmerge-backup"},
+            preparation=lambda: _check_foo_file(pkgdir, foo_filename, must_exist=False),
+        ),
+    ]
+    test_commands["emerge --regen/--metadata"] = PortageCommandSequence(*regen_seq)
+    # Assuming that the sequence ends here!
 
     # test_commands["foo pkg exists"] = lambda: _check_foo_file(
     #     pkgdir, foo_filename, must_exist=True