Blame SOURCES/bz1786964-01-code-formatting.patch

80f2be
From aa811f21186ac22f25d1c890fb444f8520706803 Mon Sep 17 00:00:00 2001
80f2be
From: Tomas Jelinek <tojeline@redhat.com>
80f2be
Date: Thu, 14 Jul 2022 16:22:39 +0200
80f2be
Subject: [PATCH 1/4] code formatting
80f2be
80f2be
---
80f2be
 pcs_test/tier0/lib/commands/test_booth.py | 1684 +++++++++------------
80f2be
 1 file changed, 723 insertions(+), 961 deletions(-)
80f2be
80f2be
diff --git a/pcs_test/tier0/lib/commands/test_booth.py b/pcs_test/tier0/lib/commands/test_booth.py
80f2be
index 6dc0cf3e..2b20a199 100644
80f2be
--- a/pcs_test/tier0/lib/commands/test_booth.py
80f2be
+++ b/pcs_test/tier0/lib/commands/test_booth.py
80f2be
@@ -211,22 +211,23 @@ class ConfigSetup(TestCase, FixtureMixin):
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
-            [fixture.error(reports.codes.BOOTH_EVEN_PEERS_NUM, number=4)]
80f2be
+            [
80f2be
+                fixture.error(reports.codes.BOOTH_EVEN_PEERS_NUM, number=4),
80f2be
+            ]
80f2be
         )
80f2be
 
80f2be
     def fixture_config_success(self, instance_name="booth"):
80f2be
-        (
80f2be
-            self.config.raw_file.write(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(instance_name),
80f2be
-                RANDOM_KEY,
80f2be
-                name="raw_file.write.key",
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                self.fixture_cfg_content(self.fixture_key_path(instance_name)),
80f2be
-                name="raw_file.write.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(instance_name),
80f2be
+            RANDOM_KEY,
80f2be
+            name="raw_file.write.key",
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            self.fixture_cfg_content(self.fixture_key_path(instance_name)),
80f2be
+            name="raw_file.write.cfg",
80f2be
         )
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
@@ -248,19 +249,18 @@ class ConfigSetup(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_files_exist_config(self):
80f2be
-        (
80f2be
-            self.config.raw_file.write(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                RANDOM_KEY,
80f2be
-                name="raw_file.write.key",
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(),
80f2be
-                already_exists=True,
80f2be
-                name="raw_file.write.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            RANDOM_KEY,
80f2be
+            name="raw_file.write.key",
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(),
80f2be
+            already_exists=True,
80f2be
+            name="raw_file.write.cfg",
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
@@ -283,14 +283,12 @@ class ConfigSetup(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_files_exist_key(self):
80f2be
-        (
80f2be
-            self.config.raw_file.write(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                RANDOM_KEY,
80f2be
-                already_exists=True,
80f2be
-                name="raw_file.write.key",
80f2be
-            )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            RANDOM_KEY,
80f2be
+            already_exists=True,
80f2be
+            name="raw_file.write.key",
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
@@ -313,20 +311,19 @@ class ConfigSetup(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_files_exist_forced(self):
80f2be
-        (
80f2be
-            self.config.raw_file.write(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                RANDOM_KEY,
80f2be
-                can_overwrite=True,
80f2be
-                name="raw_file.write.key",
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(),
80f2be
-                can_overwrite=True,
80f2be
-                name="raw_file.write.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            RANDOM_KEY,
80f2be
+            can_overwrite=True,
80f2be
+            name="raw_file.write.key",
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(),
80f2be
+            can_overwrite=True,
80f2be
+            name="raw_file.write.cfg",
80f2be
         )
80f2be
 
80f2be
         commands.config_setup(
80f2be
@@ -337,7 +334,6 @@ class ConfigSetup(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def _assert_write_config_error(self, error, booth_dir_exists):
80f2be
-
80f2be
         self.config.raw_file.write(
80f2be
             file_type_codes.BOOTH_KEY,
80f2be
             self.fixture_key_path(),
80f2be
@@ -444,11 +440,7 @@ class ConfigSetup(TestCase, FixtureMixin):
80f2be
         )
80f2be
         env = self.env_assist.get_env()
80f2be
 
80f2be
-        commands.config_setup(
80f2be
-            env,
80f2be
-            self.sites,
80f2be
-            self.arbitrators,
80f2be
-        )
80f2be
+        commands.config_setup(env, self.sites, self.arbitrators)
80f2be
 
80f2be
         self.assertEqual(
80f2be
             env.get_booth_env(name="").export(),
80f2be
@@ -491,38 +483,34 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
         self.env_assist, self.config = get_env_tools(self)
80f2be
 
80f2be
     def fixture_config_booth_not_used(self, instance_name="booth"):
80f2be
-        (
80f2be
-            self.config.runner.cib.load()
80f2be
-            .services.is_running(
80f2be
-                "booth", instance=instance_name, return_value=False
80f2be
-            )
80f2be
-            .services.is_enabled(
80f2be
-                "booth", instance=instance_name, return_value=False
80f2be
-            )
80f2be
+        self.config.runner.cib.load()
80f2be
+        self.config.services.is_running(
80f2be
+            "booth", instance=instance_name, return_value=False
80f2be
+        )
80f2be
+        self.config.services.is_enabled(
80f2be
+            "booth", instance=instance_name, return_value=False
80f2be
         )
80f2be
 
80f2be
     def fixture_config_success(self, instance_name="booth"):
80f2be
         self.fixture_config_booth_not_used(instance_name)
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                content=self.fixture_cfg_content(
80f2be
-                    self.fixture_key_path(instance_name)
80f2be
-                ),
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(instance_name),
80f2be
-                fail_if_file_not_found=False,
80f2be
-                name="raw_file.remove.key",
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            content=self.fixture_cfg_content(
80f2be
+                self.fixture_key_path(instance_name)
80f2be
+            ),
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(instance_name),
80f2be
+            fail_if_file_not_found=False,
80f2be
+            name="raw_file.remove.key",
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
     def test_invalid_instance(self):
80f2be
@@ -540,9 +528,7 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
         self.fixture_config_success()
80f2be
-        commands.config_destroy(
80f2be
-            self.env_assist.get_env(),
80f2be
-        )
80f2be
+        commands.config_destroy(self.env_assist.get_env())
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
@@ -553,23 +539,20 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_success_no_booth_key(self):
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=bytes(),
80f2be
-            ).raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=bytes(),
80f2be
         )
80f2be
-
80f2be
-        commands.config_destroy(
80f2be
-            self.env_assist.get_env(),
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
+        commands.config_destroy(self.env_assist.get_env())
80f2be
+
80f2be
     def test_not_live_booth(self):
80f2be
         self.config.env.set_booth(
80f2be
             {
80f2be
@@ -603,9 +586,7 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.LIVE_ENVIRONMENT_REQUIRED,
80f2be
-                    forbidden_options=[
80f2be
-                        file_type_codes.CIB,
80f2be
-                    ],
80f2be
+                    forbidden_options=[file_type_codes.CIB],
80f2be
                 ),
80f2be
             ],
80f2be
             expected_in_processor=False,
80f2be
@@ -640,20 +621,16 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
     def test_booth_config_in_use(self):
80f2be
         instance_name = "booth"
80f2be
 
80f2be
-        (
80f2be
-            self.config.runner.cib.load(resources=self.fixture_cib_resources())
80f2be
-            .services.is_running(
80f2be
-                "booth", instance=instance_name, return_value=True
80f2be
-            )
80f2be
-            .services.is_enabled(
80f2be
-                "booth", instance=instance_name, return_value=True
80f2be
-            )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_resources())
80f2be
+        self.config.services.is_running(
80f2be
+            "booth", instance=instance_name, return_value=True
80f2be
+        )
80f2be
+        self.config.services.is_enabled(
80f2be
+            "booth", instance=instance_name, return_value=True
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_destroy(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_destroy(self.env_assist.get_env()),
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -682,18 +659,14 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
     def test_cannot_read_config(self):
80f2be
         error = "an error"
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_destroy(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_destroy(self.env_assist.get_env()),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -711,17 +684,16 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
     def test_cannot_read_config_forced(self):
80f2be
         error = "an error"
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=error,
80f2be
-            ).raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=error,
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
         commands.config_destroy(
80f2be
@@ -742,18 +714,14 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_config_parse_error(self):
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content="invalid config".encode("utf-8"),
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content="invalid config".encode("utf-8"),
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_destroy(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_destroy(self.env_assist.get_env()),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -768,17 +736,16 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_config_parse_error_forced(self):
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content="invalid config".encode("utf-8"),
80f2be
-            ).raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content="invalid config".encode("utf-8"),
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
         commands.config_destroy(
80f2be
@@ -797,52 +764,45 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_key_already_deleted(self):
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                fail_if_file_not_found=False,
80f2be
-                file_not_found_exception=True,
80f2be
-                name="raw_file.remove.key",
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
         )
80f2be
-
80f2be
-        commands.config_destroy(
80f2be
-            self.env_assist.get_env(),
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            fail_if_file_not_found=False,
80f2be
+            file_not_found_exception=True,
80f2be
+            name="raw_file.remove.key",
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
+        commands.config_destroy(self.env_assist.get_env())
80f2be
+
80f2be
     def test_cannot_delete_key(self):
80f2be
         error = "an error"
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            ).raw_file.remove(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                fail_if_file_not_found=False,
80f2be
-                exception_msg=error,
80f2be
-                name="raw_file.remove.key",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            fail_if_file_not_found=False,
80f2be
+            exception_msg=error,
80f2be
+            name="raw_file.remove.key",
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_destroy(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_destroy(self.env_assist.get_env()),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -860,25 +820,23 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
     def test_cannot_delete_key_forced(self):
80f2be
         error = "an error"
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                fail_if_file_not_found=False,
80f2be
-                exception_msg=error,
80f2be
-                name="raw_file.remove.key",
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            fail_if_file_not_found=False,
80f2be
+            exception_msg=error,
80f2be
+            name="raw_file.remove.key",
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
         commands.config_destroy(
80f2be
@@ -900,31 +858,27 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
     def test_cannot_delete_config_forced(self):
80f2be
         error = "an error"
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                fail_if_file_not_found=False,
80f2be
-                name="raw_file.remove.key",
80f2be
-            )
80f2be
-            .raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                exception_msg=error,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            fail_if_file_not_found=False,
80f2be
+            name="raw_file.remove.key",
80f2be
+        )
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            exception_msg=error,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_destroy(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_destroy(self.env_assist.get_env()),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -941,22 +895,19 @@ class ConfigDestroy(TestCase, FixtureMixin):
80f2be
     def test_keyfile_outside_of_booth_dir(self):
80f2be
         key_path = "/tmp/pcs_test/booth.key"
80f2be
         self.fixture_config_booth_not_used()
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=f"authfile = {key_path}".encode("utf-8"),
80f2be
-            ).raw_file.remove(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                fail_if_file_not_found=True,
80f2be
-                name="raw_file.remove.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=f"authfile = {key_path}".encode("utf-8"),
80f2be
         )
80f2be
-
80f2be
-        commands.config_destroy(
80f2be
-            self.env_assist.get_env(),
80f2be
+        self.config.raw_file.remove(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            fail_if_file_not_found=True,
80f2be
+            name="raw_file.remove.cfg",
80f2be
         )
80f2be
+
80f2be
+        commands.config_destroy(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
                 fixture.warn(
80f2be
@@ -987,29 +938,23 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
         config_content = "my config content".encode("utf-8")
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=config_content,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=config_content,
80f2be
         )
80f2be
         self.assertEqual(
80f2be
-            commands.config_text(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            commands.config_text(self.env_assist.get_env()),
80f2be
             config_content,
80f2be
         )
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
         config_content = "my config content".encode("utf-8")
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                content=config_content,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            content=config_content,
80f2be
         )
80f2be
         self.assertEqual(
80f2be
             commands.config_text(
80f2be
@@ -1029,9 +974,7 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
             }
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_text(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_text(self.env_assist.get_env()),
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.LIVE_ENVIRONMENT_REQUIRED,
80f2be
@@ -1046,17 +989,13 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_cannot_read_config(self):
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_text(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_text(self.env_assist.get_env()),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -1073,12 +1012,10 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
     def test_remote_success(self):
80f2be
         instance_name = "my_booth"
80f2be
         config_content = "my config content"
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                instance_name,
80f2be
-                config_data=config_content,
80f2be
-                node_labels=["node1"],
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            instance_name,
80f2be
+            config_data=config_content,
80f2be
+            node_labels=["node1"],
80f2be
         )
80f2be
         self.assertEqual(
80f2be
             commands.config_text(
80f2be
@@ -1095,22 +1032,19 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
         server_error = (
80f2be
             "some error like 'config does not exist' or 'instance name invalid'"
80f2be
         )
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                instance_name,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=node_name,
80f2be
-                        response_code=400,
80f2be
-                        output=server_error,
80f2be
-                    )
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            instance_name,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=node_name,
80f2be
+                    response_code=400,
80f2be
+                    output=server_error,
80f2be
+                )
80f2be
+            ],
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_text(
80f2be
-                self.env_assist.get_env(),
80f2be
-                node_name=node_name,
80f2be
+                self.env_assist.get_env(), node_name=node_name
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1127,21 +1061,18 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
     def test_remote_bad_response(self):
80f2be
         instance_name = "booth"
80f2be
         node_name = "node1"
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                instance_name,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=node_name,
80f2be
-                        output="not a json",
80f2be
-                    )
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            instance_name,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=node_name,
80f2be
+                    output="not a json",
80f2be
+                )
80f2be
+            ],
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_text(
80f2be
-                self.env_assist.get_env(),
80f2be
-                node_name=node_name,
80f2be
+                self.env_assist.get_env(), node_name=node_name
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1157,23 +1088,20 @@ class ConfigText(TestCase, FixtureMixin):
80f2be
         instance_name = "booth"
80f2be
         node_name = "node1"
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                instance_name,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=node_name,
80f2be
-                        was_connected=False,
80f2be
-                        errno=1,
80f2be
-                        error_msg=error,
80f2be
-                    )
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            instance_name,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=node_name,
80f2be
+                    was_connected=False,
80f2be
+                    errno=1,
80f2be
+                    error_msg=error,
80f2be
+                )
80f2be
+            ],
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_text(
80f2be
-                self.env_assist.get_env(),
80f2be
-                node_name=node_name,
80f2be
+                self.env_assist.get_env(), node_name=node_name
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1208,22 +1136,21 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def fixture_config_success(self, instance_name="booth"):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                content=self.fixture_cfg_content(
80f2be
-                    self.fixture_key_path(instance_name)
80f2be
-                ),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    self.fixture_key_path(instance_name),
80f2be
-                    ticket_list=[["ticketA", []]],
80f2be
-                ),
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            content=self.fixture_cfg_content(
80f2be
+                self.fixture_key_path(instance_name)
80f2be
+            ),
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            self.fixture_cfg_content(
80f2be
+                self.fixture_key_path(instance_name),
80f2be
+                ticket_list=[["ticketA", []]],
80f2be
+            ),
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
@@ -1268,21 +1195,20 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_success_ticket_options(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketA", [("retries", "10"), ("timeout", "20")]]
80f2be
-                    ]
80f2be
-                ),
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(
80f2be
+                ticket_list=[
80f2be
+                    ["ticketA", [("retries", "10"), ("timeout", "20")]]
80f2be
+                ]
80f2be
+            ),
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
         commands.config_ticket_add(
80f2be
             self.env_assist.get_env(),
80f2be
@@ -1291,12 +1217,10 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_ticket_already_exists(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(ticket_list=[["ticketA", []]]),
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(ticket_list=[["ticketA", []]]),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_add(
80f2be
@@ -1316,12 +1240,10 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_validator_errors(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_add(
80f2be
@@ -1356,19 +1278,16 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_invalid_ticket_options_forced(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    ticket_list=[["ticketA", [("a", "A")]]]
80f2be
-                ),
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(ticket_list=[["ticketA", [("a", "A")]]]),
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
         commands.config_ticket_add(
80f2be
             self.env_assist.get_env(),
80f2be
@@ -1399,12 +1318,10 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_config_parse_error(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content="invalid config".encode("utf-8"),
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content="invalid config".encode("utf-8"),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_add(
80f2be
@@ -1425,12 +1342,10 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_cannot_read_config(self):
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_add(
80f2be
@@ -1480,18 +1395,17 @@ class ConfigTicketAdd(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_cannot_write_config(self):
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(ticket_list=[["ticketA", []]]),
80f2be
-                can_overwrite=True,
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(ticket_list=[["ticketA", []]]),
80f2be
+            can_overwrite=True,
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_add(
80f2be
@@ -1532,46 +1446,40 @@ class ConfigTicketRemove(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def fixture_config_success(self, instance_name="booth"):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    self.fixture_key_path(instance_name),
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketA", []],
80f2be
-                        ["ticketB", []],
80f2be
-                        ["ticketC", []],
80f2be
-                    ],
80f2be
-                ),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    self.fixture_key_path(instance_name),
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketA", []],
80f2be
-                        ["ticketC", []],
80f2be
-                    ],
80f2be
-                ),
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            self.fixture_cfg_content(
80f2be
+                self.fixture_key_path(instance_name),
80f2be
+                ticket_list=[
80f2be
+                    ["ticketA", []],
80f2be
+                    ["ticketB", []],
80f2be
+                    ["ticketC", []],
80f2be
+                ],
80f2be
+            ),
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            self.fixture_cfg_content(
80f2be
+                self.fixture_key_path(instance_name),
80f2be
+                ticket_list=[
80f2be
+                    ["ticketA", []],
80f2be
+                    ["ticketC", []],
80f2be
+                ],
80f2be
+            ),
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
         self.fixture_config_success()
80f2be
-        commands.config_ticket_remove(
80f2be
-            self.env_assist.get_env(),
80f2be
-            "ticketB",
80f2be
-        )
80f2be
+        commands.config_ticket_remove(self.env_assist.get_env(), "ticketB")
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
         self.fixture_config_success(instance_name=instance_name)
80f2be
         commands.config_ticket_remove(
80f2be
-            self.env_assist.get_env(),
80f2be
-            "ticketB",
80f2be
-            instance_name=instance_name,
80f2be
+            self.env_assist.get_env(), "ticketB", instance_name=instance_name
80f2be
         )
80f2be
 
80f2be
     def test_success_not_live(self):
80f2be
@@ -1602,51 +1510,44 @@ class ConfigTicketRemove(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_success_ticket_options(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketA", [("a1", "A1"), ("a2", "A2")]],
80f2be
-                        ["ticketB", [("b1", "B1"), ("b2", "B2")]],
80f2be
-                        ["ticketC", [("c1", "C1"), ("c2", "C2")]],
80f2be
-                    ]
80f2be
-                ),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketA", [("a1", "A1"), ("a2", "A2")]],
80f2be
-                        ["ticketC", [("c1", "C1"), ("c2", "C2")]],
80f2be
-                    ]
80f2be
-                ),
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(
80f2be
+                ticket_list=[
80f2be
+                    ["ticketA", [("a1", "A1"), ("a2", "A2")]],
80f2be
+                    ["ticketB", [("b1", "B1"), ("b2", "B2")]],
80f2be
+                    ["ticketC", [("c1", "C1"), ("c2", "C2")]],
80f2be
+                ]
80f2be
+            ),
80f2be
         )
80f2be
-        commands.config_ticket_remove(
80f2be
-            self.env_assist.get_env(),
80f2be
-            "ticketB",
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(
80f2be
+                ticket_list=[
80f2be
+                    ["ticketA", [("a1", "A1"), ("a2", "A2")]],
80f2be
+                    ["ticketC", [("c1", "C1"), ("c2", "C2")]],
80f2be
+                ]
80f2be
+            ),
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
+        commands.config_ticket_remove(self.env_assist.get_env(), "ticketB")
80f2be
 
80f2be
     def test_ticket_does_not_exist(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketA", []],
80f2be
-                        ["ticketC", []],
80f2be
-                    ]
80f2be
-                ),
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(
80f2be
+                ticket_list=[
80f2be
+                    ["ticketA", []],
80f2be
+                    ["ticketC", []],
80f2be
+                ]
80f2be
+            ),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_remove(
80f2be
-                self.env_assist.get_env(),
80f2be
-                "ticketB",
80f2be
+                self.env_assist.get_env(), "ticketB"
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1659,17 +1560,14 @@ class ConfigTicketRemove(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_config_parse_error(self):
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content="invalid config".encode("utf-8"),
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content="invalid config".encode("utf-8"),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_remove(
80f2be
-                self.env_assist.get_env(),
80f2be
-                "ticketB",
80f2be
+                self.env_assist.get_env(), "ticketB"
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1684,17 +1582,14 @@ class ConfigTicketRemove(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_cannot_read_config(self):
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_remove(
80f2be
-                self.env_assist.get_env(),
80f2be
-                "ticketB",
80f2be
+                self.env_assist.get_env(), "ticketB"
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1719,8 +1614,7 @@ class ConfigTicketRemove(TestCase, FixtureMixin):
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_remove(
80f2be
-                self.env_assist.get_env(),
80f2be
-                "ticketB",
80f2be
+                self.env_assist.get_env(), "ticketB"
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1737,27 +1631,25 @@ class ConfigTicketRemove(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_cannot_write_config(self):
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(
80f2be
-                    ticket_list=[
80f2be
-                        ["ticketB", []],
80f2be
-                    ]
80f2be
-                ),
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                self.fixture_cfg_content(),
80f2be
-                can_overwrite=True,
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(
80f2be
+                ticket_list=[
80f2be
+                    ["ticketB", []],
80f2be
+                ]
80f2be
+            ),
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            self.fixture_cfg_content(),
80f2be
+            can_overwrite=True,
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_ticket_remove(
80f2be
-                self.env_assist.get_env(),
80f2be
-                "ticketB",
80f2be
+                self.env_assist.get_env(), "ticketB"
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1792,40 +1684,35 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def fixture_config_success(self, instance_name="booth"):
80f2be
-        (
80f2be
-            self.config.runner.cib.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                content=self.fixture_cfg_content(
80f2be
-                    self.fixture_key_path(instance_name)
80f2be
-                ),
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:heartbeat:IPaddr2",
80f2be
-                name="runner.pcmk.load_agent.ipaddr2",
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:pacemaker:booth-site",
80f2be
-                name="runner.pcmk.load_agent.booth-site",
80f2be
-            )
80f2be
-            .env.push_cib(resources=self.fixture_cib_booth_group(instance_name))
80f2be
+        self.config.runner.cib.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            content=self.fixture_cfg_content(
80f2be
+                self.fixture_key_path(instance_name)
80f2be
+            ),
80f2be
+        )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:heartbeat:IPaddr2",
80f2be
+            name="runner.pcmk.load_agent.ipaddr2",
80f2be
+        )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:pacemaker:booth-site",
80f2be
+            name="runner.pcmk.load_agent.booth-site",
80f2be
+        )
80f2be
+        self.config.env.push_cib(
80f2be
+            resources=self.fixture_cib_booth_group(instance_name)
80f2be
         )
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
         self.fixture_config_success()
80f2be
-        commands.create_in_cluster(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.site_ip,
80f2be
-        )
80f2be
+        commands.create_in_cluster(self.env_assist.get_env(), self.site_ip)
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
         self.fixture_config_success(instance_name=instance_name)
80f2be
         commands.create_in_cluster(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.site_ip,
80f2be
-            instance_name=instance_name,
80f2be
+            self.env_assist.get_env(), self.site_ip, instance_name=instance_name
80f2be
         )
80f2be
 
80f2be
     def test_success_not_live_cib(self):
80f2be
@@ -1833,29 +1720,24 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
         env = dict(CIB_file=tmp_file)
80f2be
         with open(rc("cib-empty.xml")) as cib_file:
80f2be
             self.config.env.set_cib_data(cib_file.read(), cib_tempfile=tmp_file)
80f2be
-        (
80f2be
-            self.config.runner.cib.load(env=env)
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:heartbeat:IPaddr2",
80f2be
-                name="runner.pcmk.load_agent.ipaddr2",
80f2be
-                env=env,
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:pacemaker:booth-site",
80f2be
-                name="runner.pcmk.load_agent.booth-site",
80f2be
-                env=env,
80f2be
-            )
80f2be
-            .env.push_cib(resources=self.fixture_cib_booth_group())
80f2be
+        self.config.runner.cib.load(env=env)
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
         )
80f2be
-        commands.create_in_cluster(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.site_ip,
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:heartbeat:IPaddr2",
80f2be
+            name="runner.pcmk.load_agent.ipaddr2",
80f2be
+            env=env,
80f2be
         )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:pacemaker:booth-site",
80f2be
+            name="runner.pcmk.load_agent.booth-site",
80f2be
+            env=env,
80f2be
+        )
80f2be
+        self.config.env.push_cib(resources=self.fixture_cib_booth_group())
80f2be
+        commands.create_in_cluster(self.env_assist.get_env(), self.site_ip)
80f2be
 
80f2be
     def test_not_live_booth(self):
80f2be
         self.config.env.set_booth(
80f2be
@@ -1867,8 +1749,7 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.create_in_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.site_ip,
80f2be
+                self.env_assist.get_env(), self.site_ip
80f2be
             ),
80f2be
             [
80f2be
                 fixture.error(
80f2be
@@ -1883,19 +1764,15 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_booth_resource_already_created(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_booth_group()
80f2be
-            ).raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_booth_group())
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.create_in_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.site_ip,
80f2be
+                self.env_assist.get_env(), self.site_ip
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1904,17 +1781,14 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_booth_config_does_not_exist(self):
80f2be
         error = "an error"
80f2be
-        (
80f2be
-            self.config.runner.cib.load().raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=error,
80f2be
-            )
80f2be
+        self.config.runner.cib.load().raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=error,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.create_in_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.site_ip,
80f2be
+                self.env_assist.get_env(), self.site_ip
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1959,28 +1833,25 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_booth_agent_missing(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:heartbeat:IPaddr2",
80f2be
-                name="runner.pcmk.load_agent.ipaddr2",
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:pacemaker:booth-site",
80f2be
-                agent_is_missing=True,
80f2be
-                name="runner.pcmk.load_agent.booth-site",
80f2be
-                stderr=REASON,
80f2be
-            )
80f2be
+        self.config.runner.cib.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:heartbeat:IPaddr2",
80f2be
+            name="runner.pcmk.load_agent.ipaddr2",
80f2be
+        )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:pacemaker:booth-site",
80f2be
+            agent_is_missing=True,
80f2be
+            name="runner.pcmk.load_agent.booth-site",
80f2be
+            stderr=REASON,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.create_in_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.site_ip,
80f2be
+                self.env_assist.get_env(), self.site_ip
80f2be
             )
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -1993,30 +1864,28 @@ class CreateInCluster(TestCase, FixtureMixin):
80f2be
                 ),
80f2be
             ]
80f2be
         )
80f2be
-
80f2be
-    def test_agents_missing_forced(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:heartbeat:IPaddr2",
80f2be
-                agent_is_missing=True,
80f2be
-                name="runner.pcmk.load_agent.ipaddr2",
80f2be
-                stderr=REASON,
80f2be
-            )
80f2be
-            .runner.pcmk.load_agent(
80f2be
-                agent_name="ocf:pacemaker:booth-site",
80f2be
-                agent_is_missing=True,
80f2be
-                name="runner.pcmk.load_agent.booth-site",
80f2be
-                stderr=REASON,
80f2be
-            )
80f2be
-            .env.push_cib(
80f2be
-                resources=self.fixture_cib_booth_group(default_operations=True)
80f2be
-            )
80f2be
+
80f2be
+    def test_agents_missing_forced(self):
80f2be
+        self.config.runner.cib.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+        )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:heartbeat:IPaddr2",
80f2be
+            agent_is_missing=True,
80f2be
+            name="runner.pcmk.load_agent.ipaddr2",
80f2be
+            stderr=REASON,
80f2be
+        )
80f2be
+        self.config.runner.pcmk.load_agent(
80f2be
+            agent_name="ocf:pacemaker:booth-site",
80f2be
+            agent_is_missing=True,
80f2be
+            name="runner.pcmk.load_agent.booth-site",
80f2be
+            stderr=REASON,
80f2be
+        )
80f2be
+        self.config.env.push_cib(
80f2be
+            resources=self.fixture_cib_booth_group(default_operations=True)
80f2be
         )
80f2be
         commands.create_in_cluster(
80f2be
             self.env_assist.get_env(),
80f2be
@@ -2061,10 +1930,9 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
         self.resource_remove.assert_not_called()
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
-        (self.config.runner.cib.load(resources=self.fixture_cib_booth_group()))
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_booth_group())
80f2be
         commands.remove_from_cluster(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.resource_remove,
80f2be
+            self.env_assist.get_env(), self.resource_remove
80f2be
         )
80f2be
         self.resource_remove.assert_has_calls(
80f2be
             [
80f2be
@@ -2075,10 +1943,8 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_booth_group(instance_name)
80f2be
-            )
80f2be
+        self.config.runner.cib.load(
80f2be
+            resources=self.fixture_cib_booth_group(instance_name)
80f2be
         )
80f2be
         commands.remove_from_cluster(
80f2be
             self.env_assist.get_env(),
80f2be
@@ -2099,16 +1965,12 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
         cib_xml_man.append_to_first_tag_name(
80f2be
             "resources", self.fixture_cib_booth_group(wrap_in_resources=False)
80f2be
         )
80f2be
-        (
80f2be
-            self.config
80f2be
-            # This makes env.is_cib_live return False
80f2be
-            .env.set_cib_data(str(cib_xml_man), cib_tempfile=tmp_file)
80f2be
-            # This instructs the runner to actually return our mocked cib
80f2be
-            .runner.cib.load_content(str(cib_xml_man), env=env)
80f2be
-        )
80f2be
+        # This makes env.is_cib_live return False
80f2be
+        self.config.env.set_cib_data(str(cib_xml_man), cib_tempfile=tmp_file)
80f2be
+        # This instructs the runner to actually return our mocked cib
80f2be
+        self.config.runner.cib.load_content(str(cib_xml_man), env=env)
80f2be
         commands.remove_from_cluster(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.resource_remove,
80f2be
+            self.env_assist.get_env(), self.resource_remove
80f2be
         )
80f2be
         self.resource_remove.assert_has_calls(
80f2be
             [
80f2be
@@ -2127,8 +1989,7 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.remove_from_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.resource_remove,
80f2be
+                self.env_assist.get_env(), self.resource_remove
80f2be
             ),
80f2be
             [
80f2be
                 fixture.error(
80f2be
@@ -2147,8 +2008,7 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
         (self.config.runner.cib.load())
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.remove_from_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.resource_remove,
80f2be
+                self.env_assist.get_env(), self.resource_remove
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -2162,15 +2022,10 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
         self.resource_remove.assert_not_called()
80f2be
 
80f2be
     def test_more_booth_resources(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_more_resources()
80f2be
-            )
80f2be
-        )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_more_resources())
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.remove_from_cluster(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.resource_remove,
80f2be
+                self.env_assist.get_env(), self.resource_remove
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -2185,11 +2040,7 @@ class RemoveFromCluster(TestCase, FixtureMixin):
80f2be
         self.resource_remove.assert_not_called()
80f2be
 
80f2be
     def test_more_booth_resources_forced(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_more_resources()
80f2be
-            )
80f2be
-        )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_more_resources())
80f2be
         commands.remove_from_cluster(
80f2be
             self.env_assist.get_env(),
80f2be
             self.resource_remove,
80f2be
@@ -2234,11 +2085,8 @@ class Restart(TestCase, FixtureMixin):
80f2be
         self.resource_restart.assert_not_called()
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
-        (self.config.runner.cib.load(resources=self.fixture_cib_booth_group()))
80f2be
-        commands.restart(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.resource_restart,
80f2be
-        )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_booth_group())
80f2be
+        commands.restart(self.env_assist.get_env(), self.resource_restart)
80f2be
         self.resource_restart.assert_has_calls(
80f2be
             [
80f2be
                 mock.call(["booth-booth-service"]),
80f2be
@@ -2247,10 +2095,8 @@ class Restart(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_booth_group(instance_name)
80f2be
-            )
80f2be
+        self.config.runner.cib.load(
80f2be
+            resources=self.fixture_cib_booth_group(instance_name)
80f2be
         )
80f2be
         commands.restart(
80f2be
             self.env_assist.get_env(),
80f2be
@@ -2274,8 +2120,7 @@ class Restart(TestCase, FixtureMixin):
80f2be
         self.config.env.set_cib_data("<cib />")
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.restart(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.resource_restart,
80f2be
+                self.env_assist.get_env(), self.resource_restart
80f2be
             ),
80f2be
             [
80f2be
                 fixture.error(
80f2be
@@ -2295,8 +2140,7 @@ class Restart(TestCase, FixtureMixin):
80f2be
         (self.config.runner.cib.load())
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.restart(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.resource_restart,
80f2be
+                self.env_assist.get_env(), self.resource_restart
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -2310,15 +2154,10 @@ class Restart(TestCase, FixtureMixin):
80f2be
         self.resource_restart.assert_not_called()
80f2be
 
80f2be
     def test_more_booth_resources(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_more_resources()
80f2be
-            )
80f2be
-        )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_more_resources())
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.restart(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.resource_restart,
80f2be
+                self.env_assist.get_env(), self.resource_restart
80f2be
             ),
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -2333,11 +2172,7 @@ class Restart(TestCase, FixtureMixin):
80f2be
         self.resource_restart.assert_not_called()
80f2be
 
80f2be
     def test_more_booth_resources_forced(self):
80f2be
-        (
80f2be
-            self.config.runner.cib.load(
80f2be
-                resources=self.fixture_cib_more_resources()
80f2be
-            )
80f2be
-        )
80f2be
+        self.config.runner.cib.load(resources=self.fixture_cib_more_resources())
80f2be
         commands.restart(
80f2be
             self.env_assist.get_env(),
80f2be
             self.resource_restart,
80f2be
@@ -2390,10 +2225,7 @@ class TicketGrantRevokeMixin(FixtureMixin):
80f2be
         )
80f2be
         self.config.env.set_cib_data("<cib/>")
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: self.command(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.ticket,
80f2be
-            ),
80f2be
+            lambda: self.command(self.env_assist.get_env(), self.ticket),
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.LIVE_ENVIRONMENT_REQUIRED,
80f2be
@@ -2410,26 +2242,18 @@ class TicketGrantRevokeMixin(FixtureMixin):
80f2be
     def test_success_site_ip_specified(self):
80f2be
         self.get_booth_call()(self.ticket, self.site_ip)
80f2be
         self.command(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.ticket,
80f2be
-            site_ip=self.site_ip,
80f2be
+            self.env_assist.get_env(), self.ticket, site_ip=self.site_ip
80f2be
         )
80f2be
 
80f2be
     def test_success_site_ip_not_specified(self):
80f2be
         self.config.runner.cib.load(resources=self.fixture_cib_booth_group())
80f2be
         self.get_booth_call()(self.ticket, self.site_ip)
80f2be
-        self.command(
80f2be
-            self.env_assist.get_env(),
80f2be
-            self.ticket,
80f2be
-        )
80f2be
+        self.command(self.env_assist.get_env(), self.ticket)
80f2be
 
80f2be
     def test_cannot_find_site_ip(self):
80f2be
         self.config.runner.cib.load()
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: self.command(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.ticket,
80f2be
-            ),
80f2be
+            lambda: self.command(self.env_assist.get_env(), self.ticket),
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.BOOTH_CANNOT_DETERMINE_LOCAL_SITE_IP,
80f2be
@@ -2448,9 +2272,7 @@ class TicketGrantRevokeMixin(FixtureMixin):
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: self.command(
80f2be
-                self.env_assist.get_env(),
80f2be
-                self.ticket,
80f2be
-                site_ip=self.site_ip,
80f2be
+                self.env_assist.get_env(), self.ticket, site_ip=self.site_ip
80f2be
             ),
80f2be
             [
80f2be
                 fixture.error(
80f2be
@@ -2496,34 +2318,30 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
             self.fixture_key_path(instance_name)
80f2be
         )
80f2be
         self.fixture_config_read_success(instance_name=instance_name)
80f2be
-        (
80f2be
-            self.config.http.booth.send_config(
80f2be
-                instance_name,
80f2be
-                config_content.decode("utf-8"),
80f2be
-                authfile=os.path.basename(self.fixture_key_path(instance_name)),
80f2be
-                authfile_data=RANDOM_KEY,
80f2be
-                node_labels=self.node_list,
80f2be
-            )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            instance_name,
80f2be
+            config_content.decode("utf-8"),
80f2be
+            authfile=os.path.basename(self.fixture_key_path(instance_name)),
80f2be
+            authfile_data=RANDOM_KEY,
80f2be
+            node_labels=self.node_list,
80f2be
         )
80f2be
 
80f2be
     def fixture_config_read_success(self, instance_name="booth"):
80f2be
         config_content = self.fixture_cfg_content(
80f2be
             self.fixture_key_path(instance_name)
80f2be
         )
80f2be
-        (
80f2be
-            self.config.corosync_conf.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(instance_name),
80f2be
-                content=config_content,
80f2be
-                name="raw_file.read.conf",
80f2be
-            )
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(instance_name),
80f2be
-                content=RANDOM_KEY,
80f2be
-                name="raw_file.read.key",
80f2be
-            )
80f2be
+        self.config.corosync_conf.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(instance_name),
80f2be
+            content=config_content,
80f2be
+            name="raw_file.read.conf",
80f2be
+        )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(instance_name),
80f2be
+            content=RANDOM_KEY,
80f2be
+            name="raw_file.read.key",
80f2be
         )
80f2be
 
80f2be
     def fixture_reports_success(self, instance_name="booth"):
80f2be
@@ -2552,30 +2370,23 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
         self.fixture_config_success()
80f2be
-        commands.config_sync(
80f2be
-            self.env_assist.get_env(),
80f2be
-        )
80f2be
+        commands.config_sync(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(self.fixture_reports_success())
80f2be
 
80f2be
     def test_success_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
         self.fixture_config_success(instance_name=instance_name)
80f2be
         commands.config_sync(
80f2be
-            self.env_assist.get_env(),
80f2be
-            instance_name=instance_name,
80f2be
+            self.env_assist.get_env(), instance_name=instance_name
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
-            self.fixture_reports_success(
80f2be
-                instance_name=instance_name,
80f2be
-            )
80f2be
+            self.fixture_reports_success(instance_name=instance_name)
80f2be
         )
80f2be
 
80f2be
     def test_not_live_cib(self):
80f2be
         self.config.env.set_cib_data("<cib/>")
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.LIVE_ENVIRONMENT_REQUIRED,
80f2be
@@ -2596,56 +2407,45 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
                 "key_path": "some key path",
80f2be
             }
80f2be
         )
80f2be
-        (
80f2be
-            self.config.corosync_conf.load(
80f2be
-                node_name_list=self.node_list
80f2be
-            ).http.booth.send_config(
80f2be
-                instance_name,
80f2be
-                config_data.decode("utf-8"),
80f2be
-                authfile=os.path.basename(key_path),
80f2be
-                authfile_data=key_data,
80f2be
-                node_labels=self.node_list,
80f2be
-            )
80f2be
+        self.config.corosync_conf.load(node_name_list=self.node_list)
80f2be
+        self.config.http.booth.send_config(
80f2be
+            instance_name,
80f2be
+            config_data.decode("utf-8"),
80f2be
+            authfile=os.path.basename(key_path),
80f2be
+            authfile_data=key_data,
80f2be
+            node_labels=self.node_list,
80f2be
         )
80f2be
 
80f2be
     def test_not_live_booth_default_instance(self):
80f2be
         self.fixture_config_success_not_live()
80f2be
-        commands.config_sync(
80f2be
-            self.env_assist.get_env(),
80f2be
-        )
80f2be
+        commands.config_sync(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(self.fixture_reports_success())
80f2be
 
80f2be
     def test_not_live_booth_custom_instance(self):
80f2be
         instance_name = "my_booth"
80f2be
         self.fixture_config_success_not_live(instance_name=instance_name)
80f2be
         commands.config_sync(
80f2be
-            self.env_assist.get_env(),
80f2be
-            instance_name=instance_name,
80f2be
+            self.env_assist.get_env(), instance_name=instance_name
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
-            self.fixture_reports_success(
80f2be
-                instance_name=instance_name,
80f2be
-            )
80f2be
+            self.fixture_reports_success(instance_name=instance_name)
80f2be
         )
80f2be
 
80f2be
     def test_some_node_names_missing(self):
80f2be
         nodes = ["rh7-2"]
80f2be
         self.fixture_config_read_success()
80f2be
-        (
80f2be
-            self.config.corosync_conf.load(
80f2be
-                filename="corosync-some-node-names.conf",
80f2be
-                instead="corosync_conf.load",
80f2be
-            ).http.booth.send_config(
80f2be
-                "booth",
80f2be
-                self.fixture_cfg_content().decode("utf-8"),
80f2be
-                authfile=os.path.basename(self.fixture_key_path()),
80f2be
-                authfile_data=RANDOM_KEY,
80f2be
-                node_labels=nodes,
80f2be
-            )
80f2be
+        self.config.corosync_conf.load(
80f2be
+            filename="corosync-some-node-names.conf",
80f2be
+            instead="corosync_conf.load",
80f2be
         )
80f2be
-        commands.config_sync(
80f2be
-            self.env_assist.get_env(),
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth",
80f2be
+            self.fixture_cfg_content().decode("utf-8"),
80f2be
+            authfile=os.path.basename(self.fixture_key_path()),
80f2be
+            authfile_data=RANDOM_KEY,
80f2be
+            node_labels=nodes,
80f2be
         )
80f2be
+        commands.config_sync(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
                 fixture.info(reports.codes.BOOTH_CONFIG_DISTRIBUTION_STARTED),
80f2be
@@ -2666,11 +2466,9 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_all_node_names_missing(self):
80f2be
         self.fixture_config_read_success()
80f2be
-        (
80f2be
-            self.config.corosync_conf.load(
80f2be
-                filename="corosync-no-node-names.conf",
80f2be
-                instead="corosync_conf.load",
80f2be
-            )
80f2be
+        self.config.corosync_conf.load(
80f2be
+            filename="corosync-no-node-names.conf",
80f2be
+            instead="corosync_conf.load",
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_sync(self.env_assist.get_env())
80f2be
@@ -2687,23 +2485,21 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_node_failure(self):
80f2be
         self.fixture_config_read_success()
80f2be
-        (
80f2be
-            self.config.http.booth.send_config(
80f2be
-                "booth",
80f2be
-                self.fixture_cfg_content().decode("utf-8"),
80f2be
-                authfile=os.path.basename(self.fixture_key_path()),
80f2be
-                authfile_data=RANDOM_KEY,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=self.node_list[0],
80f2be
-                        response_code=400,
80f2be
-                        output=self.reason,
80f2be
-                    ),
80f2be
-                    dict(
80f2be
-                        label=self.node_list[1],
80f2be
-                    ),
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth",
80f2be
+            self.fixture_cfg_content().decode("utf-8"),
80f2be
+            authfile=os.path.basename(self.fixture_key_path()),
80f2be
+            authfile_data=RANDOM_KEY,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=self.node_list[0],
80f2be
+                    response_code=400,
80f2be
+                    output=self.reason,
80f2be
+                ),
80f2be
+                dict(
80f2be
+                    label=self.node_list[1],
80f2be
+                ),
80f2be
+            ],
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.config_sync(self.env_assist.get_env()), []
80f2be
@@ -2728,23 +2524,21 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_node_failure_skip_offline(self):
80f2be
         self.fixture_config_read_success()
80f2be
-        (
80f2be
-            self.config.http.booth.send_config(
80f2be
-                "booth",
80f2be
-                self.fixture_cfg_content().decode("utf-8"),
80f2be
-                authfile=os.path.basename(self.fixture_key_path()),
80f2be
-                authfile_data=RANDOM_KEY,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=self.node_list[0],
80f2be
-                        response_code=400,
80f2be
-                        output=self.reason,
80f2be
-                    ),
80f2be
-                    dict(
80f2be
-                        label=self.node_list[1],
80f2be
-                    ),
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth",
80f2be
+            self.fixture_cfg_content().decode("utf-8"),
80f2be
+            authfile=os.path.basename(self.fixture_key_path()),
80f2be
+            authfile_data=RANDOM_KEY,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=self.node_list[0],
80f2be
+                    response_code=400,
80f2be
+                    output=self.reason,
80f2be
+                ),
80f2be
+                dict(
80f2be
+                    label=self.node_list[1],
80f2be
+                ),
80f2be
+            ],
80f2be
         )
80f2be
 
80f2be
         commands.config_sync(self.env_assist.get_env(), skip_offline_nodes=True)
80f2be
@@ -2767,24 +2561,22 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_node_offline(self):
80f2be
         self.fixture_config_read_success()
80f2be
-        (
80f2be
-            self.config.http.booth.send_config(
80f2be
-                "booth",
80f2be
-                self.fixture_cfg_content().decode("utf-8"),
80f2be
-                authfile=os.path.basename(self.fixture_key_path()),
80f2be
-                authfile_data=RANDOM_KEY,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=self.node_list[0],
80f2be
-                        errno=1,
80f2be
-                        error_msg=self.reason,
80f2be
-                        was_connected=False,
80f2be
-                    ),
80f2be
-                    dict(
80f2be
-                        label=self.node_list[1],
80f2be
-                    ),
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth",
80f2be
+            self.fixture_cfg_content().decode("utf-8"),
80f2be
+            authfile=os.path.basename(self.fixture_key_path()),
80f2be
+            authfile_data=RANDOM_KEY,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=self.node_list[0],
80f2be
+                    errno=1,
80f2be
+                    error_msg=self.reason,
80f2be
+                    was_connected=False,
80f2be
+                ),
80f2be
+                dict(
80f2be
+                    label=self.node_list[1],
80f2be
+                ),
80f2be
+            ],
80f2be
         )
80f2be
 
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
@@ -2810,24 +2602,22 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_node_offline_skip_offline(self):
80f2be
         self.fixture_config_read_success()
80f2be
-        (
80f2be
-            self.config.http.booth.send_config(
80f2be
-                "booth",
80f2be
-                self.fixture_cfg_content().decode("utf-8"),
80f2be
-                authfile=os.path.basename(self.fixture_key_path()),
80f2be
-                authfile_data=RANDOM_KEY,
80f2be
-                communication_list=[
80f2be
-                    dict(
80f2be
-                        label=self.node_list[0],
80f2be
-                        errno=1,
80f2be
-                        error_msg=self.reason,
80f2be
-                        was_connected=False,
80f2be
-                    ),
80f2be
-                    dict(
80f2be
-                        label=self.node_list[1],
80f2be
-                    ),
80f2be
-                ],
80f2be
-            )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth",
80f2be
+            self.fixture_cfg_content().decode("utf-8"),
80f2be
+            authfile=os.path.basename(self.fixture_key_path()),
80f2be
+            authfile_data=RANDOM_KEY,
80f2be
+            communication_list=[
80f2be
+                dict(
80f2be
+                    label=self.node_list[0],
80f2be
+                    errno=1,
80f2be
+                    error_msg=self.reason,
80f2be
+                    was_connected=False,
80f2be
+                ),
80f2be
+                dict(
80f2be
+                    label=self.node_list[1],
80f2be
+                ),
80f2be
+            ],
80f2be
         )
80f2be
 
80f2be
         commands.config_sync(self.env_assist.get_env(), skip_offline_nodes=True)
80f2be
@@ -2849,15 +2639,13 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_config_not_accessible(self):
80f2be
-        (
80f2be
-            self.config.corosync_conf.load().raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                exception_msg=self.reason,
80f2be
-            )
80f2be
+        self.config.corosync_conf.load().raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            exception_msg=self.reason,
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env())
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -2881,7 +2669,7 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
         )
80f2be
         (self.config.corosync_conf.load())
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env())
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -2896,15 +2684,13 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_config_parse_error(self):
80f2be
-        (
80f2be
-            self.config.corosync_conf.load().raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content="invalid config".encode("utf-8"),
80f2be
-            )
80f2be
+        self.config.corosync_conf.load().raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content="invalid config".encode("utf-8"),
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env())
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -2924,9 +2710,9 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
                 "key_path": "some key path",
80f2be
             }
80f2be
         )
80f2be
-        (self.config.corosync_conf.load())
80f2be
+        self.config.corosync_conf.load()
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env())
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -2939,23 +2725,21 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_authfile_not_accessible(self):
80f2be
-        (
80f2be
-            self.config.corosync_conf.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=self.fixture_cfg_content(),
80f2be
-                name="raw_file.read.conf",
80f2be
-            )
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.fixture_key_path(),
80f2be
-                exception_msg=self.reason,
80f2be
-                name="raw_file.read.key",
80f2be
-            )
80f2be
+        self.config.corosync_conf.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=self.fixture_cfg_content(),
80f2be
+            name="raw_file.read.conf",
80f2be
+        )
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.fixture_key_path(),
80f2be
+            exception_msg=self.reason,
80f2be
+            name="raw_file.read.key",
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env())
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -2977,9 +2761,9 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
                 "key_path": "some key path",
80f2be
             }
80f2be
         )
80f2be
-        (self.config.corosync_conf.load())
80f2be
+        self.config.corosync_conf.load()
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: commands.config_sync(self.env_assist.get_env()),
80f2be
+            lambda: commands.config_sync(self.env_assist.get_env())
80f2be
         )
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
@@ -2994,22 +2778,22 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
         )
80f2be
 
80f2be
     def test_no_authfile(self):
80f2be
-        (
80f2be
-            self.config.corosync_conf.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=bytes(),
80f2be
-            )
80f2be
-            .http.booth.send_config(
80f2be
-                "booth",
80f2be
-                bytes().decode("utf-8"),
80f2be
-                node_labels=self.node_list,
80f2be
-            )
80f2be
+        self.config.corosync_conf.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=bytes(),
80f2be
+        )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth",
80f2be
+            bytes().decode("utf-8"),
80f2be
+            node_labels=self.node_list,
80f2be
         )
80f2be
         commands.config_sync(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(
80f2be
-            [fixture.info(reports.codes.BOOTH_CONFIG_DISTRIBUTION_STARTED)]
80f2be
+            [
80f2be
+                fixture.info(reports.codes.BOOTH_CONFIG_DISTRIBUTION_STARTED),
80f2be
+            ]
80f2be
             + [
80f2be
                 fixture.info(
80f2be
                     reports.codes.BOOTH_CONFIG_ACCEPTED_BY_NODE,
80f2be
@@ -3022,18 +2806,14 @@ class ConfigSyncTest(TestCase, FixtureMixin):
80f2be
 
80f2be
     def test_authfile_not_in_booth_dir(self):
80f2be
         config_content = "authfile=/etc/my_booth.key"
80f2be
-        (
80f2be
-            self.config.corosync_conf.load()
80f2be
-            .raw_file.read(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.fixture_cfg_path(),
80f2be
-                content=config_content.encode("utf-8"),
80f2be
-            )
80f2be
-            .http.booth.send_config(
80f2be
-                "booth",
80f2be
-                config_content,
80f2be
-                node_labels=self.node_list,
80f2be
-            )
80f2be
+        self.config.corosync_conf.load()
80f2be
+        self.config.raw_file.read(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.fixture_cfg_path(),
80f2be
+            content=config_content.encode("utf-8"),
80f2be
+        )
80f2be
+        self.config.http.booth.send_config(
80f2be
+            "booth", config_content, node_labels=self.node_list
80f2be
         )
80f2be
         commands.config_sync(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(
80f2be
@@ -3096,9 +2876,7 @@ class EnableDisableStartStopMixin(FixtureMixin):
80f2be
         )
80f2be
         self.config.env.set_cib_data("<cib/>")
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: self.command(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: self.command(self.env_assist.get_env()),
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.LIVE_ENVIRONMENT_REQUIRED,
80f2be
@@ -3114,9 +2892,7 @@ class EnableDisableStartStopMixin(FixtureMixin):
80f2be
 
80f2be
     def test_success_default_instance(self):
80f2be
         self.get_external_call()("booth", instance="booth")
80f2be
-        self.command(
80f2be
-            self.env_assist.get_env(),
80f2be
-        )
80f2be
+        self.command(self.env_assist.get_env())
80f2be
         self.env_assist.assert_reports(
80f2be
             [
80f2be
                 fixture.info(
80f2be
@@ -3149,9 +2925,7 @@ class EnableDisableStartStopMixin(FixtureMixin):
80f2be
         err_msg = "some stderr\nsome stdout"
80f2be
         self.get_external_call()("booth", instance="booth", failure_msg=err_msg)
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
-            lambda: self.command(
80f2be
-                self.env_assist.get_env(),
80f2be
-            ),
80f2be
+            lambda: self.command(self.env_assist.get_env()),
80f2be
             [
80f2be
                 fixture.error(
80f2be
                     reports.codes.SERVICE_ACTION_FAILED,
80f2be
@@ -3226,17 +3000,16 @@ class PullConfigBase(TestCase, FixtureMixin):
80f2be
 class PullConfigSuccess(PullConfigBase):
80f2be
     def setUp(self):
80f2be
         super().setUp()
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                self.name,
80f2be
-                self.config_data.decode("utf-8"),
80f2be
-                node_labels=[self.node_name],
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.config_path,
80f2be
-                self.config_data,
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            self.name,
80f2be
+            self.config_data.decode("utf-8"),
80f2be
+            node_labels=[self.node_name],
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.config_path,
80f2be
+            self.config_data,
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
 
80f2be
     def test_success(self):
80f2be
@@ -3265,17 +3038,16 @@ class PullConfigSuccessCustomInstance(TestCase, FixtureMixin):
80f2be
         ]
80f2be
 
80f2be
     def test_success(self):
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                self.name,
80f2be
-                self.config_data.decode("utf-8"),
80f2be
-                node_labels=[self.node_name],
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.config_path,
80f2be
-                self.config_data,
80f2be
-                can_overwrite=True,
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            self.name,
80f2be
+            self.config_data.decode("utf-8"),
80f2be
+            node_labels=[self.node_name],
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.config_path,
80f2be
+            self.config_data,
80f2be
+            can_overwrite=True,
80f2be
         )
80f2be
         commands.pull_config(
80f2be
             self.env_assist.get_env(),
80f2be
@@ -3514,34 +3286,31 @@ class PullConfigWithAuthfile(PullConfigBase):
80f2be
         self.authfile = os.path.basename(self.authfile_path)
80f2be
         self.authfile_data = b"auth"
80f2be
 
80f2be
-        (
80f2be
-            self.config.http.booth.get_config(
80f2be
-                self.name,
80f2be
-                self.config_data.decode("utf-8"),
80f2be
-                authfile=self.authfile,
80f2be
-                authfile_data=self.authfile_data,
80f2be
-                node_labels=[self.node_name],
80f2be
-            )
80f2be
+        self.config.http.booth.get_config(
80f2be
+            self.name,
80f2be
+            self.config_data.decode("utf-8"),
80f2be
+            authfile=self.authfile,
80f2be
+            authfile_data=self.authfile_data,
80f2be
+            node_labels=[self.node_name],
80f2be
         )
80f2be
 
80f2be
 
80f2be
 class PullConfigWithAuthfileSuccess(PullConfigWithAuthfile):
80f2be
     def setUp(self):
80f2be
         super().setUp()
80f2be
-        (
80f2be
-            self.config.raw_file.write(
80f2be
-                file_type_codes.BOOTH_KEY,
80f2be
-                self.authfile_path,
80f2be
-                self.authfile_data,
80f2be
-                can_overwrite=True,
80f2be
-                name="raw_file.write.key",
80f2be
-            ).raw_file.write(
80f2be
-                file_type_codes.BOOTH_CONFIG,
80f2be
-                self.config_path,
80f2be
-                self.config_data,
80f2be
-                can_overwrite=True,
80f2be
-                name="raw_file.write.cfg",
80f2be
-            )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_KEY,
80f2be
+            self.authfile_path,
80f2be
+            self.authfile_data,
80f2be
+            can_overwrite=True,
80f2be
+            name="raw_file.write.key",
80f2be
+        )
80f2be
+        self.config.raw_file.write(
80f2be
+            file_type_codes.BOOTH_CONFIG,
80f2be
+            self.config_path,
80f2be
+            self.config_data,
80f2be
+            can_overwrite=True,
80f2be
+            name="raw_file.write.cfg",
80f2be
         )
80f2be
 
80f2be
     def test_success(self):
80f2be
@@ -3642,13 +3411,13 @@ class GetStatus(TestCase):
80f2be
 
80f2be
     def assert_success(self, instance_name=None):
80f2be
         inner_name = instance_name or "booth"
80f2be
-        (
80f2be
-            self.config.runner.booth.status_daemon(
80f2be
-                inner_name, stdout="daemon status"
80f2be
-            )
80f2be
-            .runner.booth.status_tickets(inner_name, stdout="tickets status")
80f2be
-            .runner.booth.status_peers(inner_name, stdout="peers status")
80f2be
+        self.config.runner.booth.status_daemon(
80f2be
+            inner_name, stdout="daemon status"
80f2be
         )
80f2be
+        self.config.runner.booth.status_tickets(
80f2be
+            inner_name, stdout="tickets status"
80f2be
+        )
80f2be
+        self.config.runner.booth.status_peers(inner_name, stdout="peers status")
80f2be
         self.assertEqual(
80f2be
             commands.get_status(
80f2be
                 self.env_assist.get_env(), instance_name=instance_name
80f2be
@@ -3667,10 +3436,8 @@ class GetStatus(TestCase):
80f2be
         self.assert_success(instance_name="my_booth")
80f2be
 
80f2be
     def test_daemon_status_failure(self):
80f2be
-        (
80f2be
-            self.config.runner.booth.status_daemon(
80f2be
-                "booth", stdout="some output", stderr="some error", returncode=1
80f2be
-            )
80f2be
+        self.config.runner.booth.status_daemon(
80f2be
+            "booth", stdout="some output", stderr="some error", returncode=1
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.get_status(self.env_assist.get_env()),
80f2be
@@ -3684,12 +3451,9 @@ class GetStatus(TestCase):
80f2be
         )
80f2be
 
80f2be
     def test_ticket_status_failure(self):
80f2be
-        (
80f2be
-            self.config.runner.booth.status_daemon(
80f2be
-                "booth", stdout="daemon status"
80f2be
-            ).runner.booth.status_tickets(
80f2be
-                "booth", stdout="some output", stderr="some error", returncode=1
80f2be
-            )
80f2be
+        self.config.runner.booth.status_daemon("booth", stdout="daemon status")
80f2be
+        self.config.runner.booth.status_tickets(
80f2be
+            "booth", stdout="some output", stderr="some error", returncode=1
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.get_status(self.env_assist.get_env()),
80f2be
@@ -3703,14 +3467,12 @@ class GetStatus(TestCase):
80f2be
         )
80f2be
 
80f2be
     def test_peers_status_failure(self):
80f2be
-        (
80f2be
-            self.config.runner.booth.status_daemon(
80f2be
-                "booth", stdout="daemon status"
80f2be
-            )
80f2be
-            .runner.booth.status_tickets("booth", stdout="tickets status")
80f2be
-            .runner.booth.status_peers(
80f2be
-                "booth", stdout="some output", stderr="some error", returncode=1
80f2be
-            )
80f2be
+        self.config.runner.booth.status_daemon("booth", stdout="daemon status")
80f2be
+        self.config.runner.booth.status_tickets(
80f2be
+            "booth", stdout="tickets status"
80f2be
+        )
80f2be
+        self.config.runner.booth.status_peers(
80f2be
+            "booth", stdout="some output", stderr="some error", returncode=1
80f2be
         )
80f2be
         self.env_assist.assert_raise_library_error(
80f2be
             lambda: commands.get_status(self.env_assist.get_env()),
80f2be
-- 
80f2be
2.35.3
80f2be