Merge pull request #1189 from mkoura/remove_currently_broken_xfails

Remove xfailures for "currently broken" commands

Author: mkoura

cardano_node_tests/tests/test_blocks.py

@@ -74,20 +74,11 @@ def test_pool_blocks(
             queried_epoch = cluster.get_epoch() + 1
 
         # query leadership schedule for selected pool
-        # TODO: the query is currently broken
-        query_currently_broken = False
-        try:
-            leadership_schedule = cluster.get_leadership_schedule(
-                vrf_skey_file=pool_rec["vrf_key_pair"].skey_file,
-                cold_vkey_file=pool_rec["cold_key_pair"].vkey_file,
-                for_next=for_epoch != "current",
-            )
-        except clusterlib.CLIError as err:
-            if "currently broken" not in str(err):
-                raise
-            query_currently_broken = True
-        if query_currently_broken:
-            pytest.xfail("`query leadership-schedule` is currently broken")
+        leadership_schedule = cluster.get_leadership_schedule(
+            vrf_skey_file=pool_rec["vrf_key_pair"].skey_file,
+            cold_vkey_file=pool_rec["cold_key_pair"].vkey_file,
+            for_next=for_epoch != "current",
+        )
 
         # wait for epoch that comes after the queried epoch
         cluster.wait_for_new_epoch(new_epochs=1 if for_epoch == "current" else 2)
@@ -170,9 +161,6 @@ def test_unstable_stake_distribution(
             )
         err_str = str(excinfo.value)
 
-        # TODO: the query is currently broken
-        if "currently broken" in err_str:
-            pytest.xfail("`query leadership-schedule` is currently broken")
         if "PastHorizon" in err_str:
             pytest.xfail("`query leadership-schedule` is affected by cardano-node issue 4002")
 

cardano_node_tests/tests/test_kes.py

@@ -229,34 +229,23 @@ def _refresh_opcerts():
             time.sleep(120)
 
         # check kes-period-info with an operational certificate with KES expired
-        # TODO: the query is currently broken
-        kes_query_currently_broken = False
-        try:
-            kes_info_expired = cluster.get_kes_period_info(
-                opcert_file=expire_pool_rec["pool_operational_cert"]
+        kes_info_expired = cluster.get_kes_period_info(
+            opcert_file=expire_pool_rec["pool_operational_cert"]
+        )
+        kes.check_kes_period_info_result(
+            kes_output=kes_info_expired, expected_scenario=kes.KesScenarios.INVALID_KES_PERIOD
+        )
+
+        # check kes-period-info with valid operational certificates
+        for n in refreshed_nodes:
+            refreshed_pool_rec = cluster_manager.cache.addrs_data[f"node-{n}"]
+            kes_info_valid = cluster.get_kes_period_info(
+                opcert_file=refreshed_pool_rec["pool_operational_cert"]
             )
-        except clusterlib.CLIError as err:
-            if "currentlyBroken" not in str(err):
-                raise
-            kes_query_currently_broken = True
-
-        if kes_query_currently_broken:
-            pytest.xfail("`query kes-period-info` is currently broken")
-        else:
             kes.check_kes_period_info_result(
-                kes_output=kes_info_expired, expected_scenario=kes.KesScenarios.INVALID_KES_PERIOD
+                kes_output=kes_info_valid, expected_scenario=kes.KesScenarios.ALL_VALID
             )
 
-            # check kes-period-info with valid operational certificates
-            for n in refreshed_nodes:
-                refreshed_pool_rec = cluster_manager.cache.addrs_data[f"node-{n}"]
-                kes_info_valid = cluster.get_kes_period_info(
-                    opcert_file=refreshed_pool_rec["pool_operational_cert"]
-                )
-                kes.check_kes_period_info_result(
-                    kes_output=kes_info_valid, expected_scenario=kes.KesScenarios.ALL_VALID
-                )
-
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.order(6)
     @pytest.mark.long
@@ -325,8 +314,6 @@ def test_opcert_future_kes_period(  # noqa: C901
             kes_period=cluster.get_kes_period() + 100,
         )
 
-        kes_query_currently_broken = False
-
         with cluster_manager.restart_on_failure():
             with logfiles.expect_errors(expected_errors, ignore_file_id=cluster_manager.worker_id):
                 # restart the node with the new operational certificate
@@ -351,19 +338,11 @@ def test_opcert_future_kes_period(  # noqa: C901
                     if invalid_opcert_epoch == 1:
                         # check kes-period-info with operational certificate with
                         # invalid `--kes-period`
-                        # TODO: the query is currently broken
-                        try:
-                            kes_period_info = cluster.get_kes_period_info(invalid_opcert_file)
-                        except clusterlib.CLIError as err:
-                            if "currentlyBroken" not in str(err):
-                                raise
-                            kes_query_currently_broken = True
-
-                        if not kes_query_currently_broken:
-                            kes.check_kes_period_info_result(
-                                kes_output=kes_period_info,
-                                expected_scenario=kes.KesScenarios.INVALID_KES_PERIOD,
-                            )
+                        kes_period_info = cluster.get_kes_period_info(invalid_opcert_file)
+                        kes.check_kes_period_info_result(
+                            kes_output=kes_period_info,
+                            expected_scenario=kes.KesScenarios.INVALID_KES_PERIOD,
+                        )
 
                     # test the `CounterOverIncrementedOCERT` error - the counter will now be +2 from
                     # last used opcert counter value
@@ -421,23 +400,20 @@ def test_opcert_future_kes_period(  # noqa: C901
                     f"The pool '{pool_name}' has not minted any blocks since epoch {updated_epoch}."
                 )
 
-        if kes_query_currently_broken:
-            pytest.xfail("`query kes-period-info` is currently broken")
-        else:
-            # check kes-period-info with valid operational certificate
-            kes_period_info = cluster.get_kes_period_info(valid_opcert_file)
-            kes.check_kes_period_info_result(
-                kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
-            )
+        # check kes-period-info with valid operational certificate
+        kes_period_info = cluster.get_kes_period_info(valid_opcert_file)
+        kes.check_kes_period_info_result(
+            kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
+        )
 
-            # check kes-period-info with invalid operational certificate, wrong counter and period
-            kes_period_info = cluster.get_kes_period_info(invalid_opcert_file)
-            kes.check_kes_period_info_result(
-                kes_output=kes_period_info,
-                expected_scenario=kes.KesScenarios.INVALID_KES_PERIOD
-                if VERSIONS.cluster_era > VERSIONS.ALONZO
-                else kes.KesScenarios.ALL_INVALID,
-            )
+        # check kes-period-info with invalid operational certificate, wrong counter and period
+        kes_period_info = cluster.get_kes_period_info(invalid_opcert_file)
+        kes.check_kes_period_info_result(
+            kes_output=kes_period_info,
+            expected_scenario=kes.KesScenarios.INVALID_KES_PERIOD
+            if VERSIONS.cluster_era > VERSIONS.ALONZO
+            else kes.KesScenarios.ALL_INVALID,
+        )
 
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.order(7)
@@ -499,27 +475,18 @@ def test_update_valid_opcert(
             time.sleep(10)
 
             # check kes-period-info while the pool is not minting blocks
-            # TODO: the query is currently broken
-            kes_query_currently_broken = False
-            try:
-                kes_period_info_new = cluster.get_kes_period_info(opcert_file)
-            except clusterlib.CLIError as err:
-                if "currentlyBroken" not in str(err):
-                    raise
-                kes_query_currently_broken = True
-
-            if not kes_query_currently_broken:
-                kes.check_kes_period_info_result(
-                    kes_output=kes_period_info_new, expected_scenario=kes.KesScenarios.ALL_VALID
-                )
-                kes_period_info_old = cluster.get_kes_period_info(opcert_file_old)
-                kes.check_kes_period_info_result(
-                    kes_output=kes_period_info_old, expected_scenario=kes.KesScenarios.ALL_VALID
-                )
-                assert (
-                    kes_period_info_new["metrics"]["qKesNodeStateOperationalCertificateNumber"]
-                    == kes_period_info_old["metrics"]["qKesNodeStateOperationalCertificateNumber"]
-                )
+            kes_period_info_new = cluster.get_kes_period_info(opcert_file)
+            kes.check_kes_period_info_result(
+                kes_output=kes_period_info_new, expected_scenario=kes.KesScenarios.ALL_VALID
+            )
+            kes_period_info_old = cluster.get_kes_period_info(opcert_file_old)
+            kes.check_kes_period_info_result(
+                kes_output=kes_period_info_old, expected_scenario=kes.KesScenarios.ALL_VALID
+            )
+            assert (
+                kes_period_info_new["metrics"]["qKesNodeStateOperationalCertificateNumber"]
+                == kes_period_info_old["metrics"]["qKesNodeStateOperationalCertificateNumber"]
+            )
 
             # start the node with the new operational certificate
             cluster_nodes.start_nodes([node_name])
@@ -543,26 +510,23 @@ def test_update_valid_opcert(
                     f"The pool '{pool_name}' has not minted any blocks since epoch {updated_epoch}."
                 )
 
-        if kes_query_currently_broken:
-            pytest.xfail("`query kes-period-info` is currently broken")
-        else:
-            # check that metrics reported by kes-period-info got updated once the pool started
-            # minting blocks again
-            kes_period_info_updated = cluster.get_kes_period_info(opcert_file)
-            kes.check_kes_period_info_result(
-                kes_output=kes_period_info_updated, expected_scenario=kes.KesScenarios.ALL_VALID
-            )
-            assert (
-                kes_period_info_updated["metrics"]["qKesNodeStateOperationalCertificateNumber"]
-                != kes_period_info_old["metrics"]["qKesNodeStateOperationalCertificateNumber"]
-            )
+        # check that metrics reported by kes-period-info got updated once the pool started
+        # minting blocks again
+        kes_period_info_updated = cluster.get_kes_period_info(opcert_file)
+        kes.check_kes_period_info_result(
+            kes_output=kes_period_info_updated, expected_scenario=kes.KesScenarios.ALL_VALID
+        )
+        assert (
+            kes_period_info_updated["metrics"]["qKesNodeStateOperationalCertificateNumber"]
+            != kes_period_info_old["metrics"]["qKesNodeStateOperationalCertificateNumber"]
+        )
 
-            # check kes-period-info with operational certificate with a wrong counter
-            kes_period_info_invalid = cluster.get_kes_period_info(opcert_file_old)
-            kes.check_kes_period_info_result(
-                kes_output=kes_period_info_invalid,
-                expected_scenario=kes.KesScenarios.INVALID_COUNTERS,
-            )
+        # check kes-period-info with operational certificate with a wrong counter
+        kes_period_info_invalid = cluster.get_kes_period_info(opcert_file_old)
+        kes.check_kes_period_info_result(
+            kes_output=kes_period_info_invalid,
+            expected_scenario=kes.KesScenarios.INVALID_COUNTERS,
+        )
 
     @allure.link(helpers.get_vcs_link())
     def test_no_kes_period_arg(

cardano_node_tests/tests/test_protocol.py

@@ -56,18 +56,7 @@ class TestProtocol:
     def test_protocol_state_keys(self, cluster: clusterlib.ClusterLib):
         """Check output of `query protocol-state`."""
         common.get_test_id(cluster)
-
-        # TODO: the query is currently broken
-        query_currently_broken = False
-        try:
-            protocol_state = cluster.get_protocol_state()
-        except clusterlib.CLIError as err:
-            if "currentlyBroken" not in str(err):
-                raise
-            query_currently_broken = True
-        if query_currently_broken:
-            pytest.xfail("`query protocol-state` is currently broken")
-
+        protocol_state = cluster.get_protocol_state()
         assert tuple(sorted(protocol_state)) == PROTOCOL_STATE_KEYS
 
     @allure.link(helpers.get_vcs_link())

cardano_node_tests/tests/test_staking_no_rewards.py

@@ -823,19 +823,10 @@ def test_deregister_reward_addr_retire_pool(  # noqa: C901
             ).pool_params, f"The pool {pool_id} was not deregistered"
 
             # check command kes-period-info case: de-register pool
-            # TODO: the query is currently broken
-            kes_query_currently_broken = False
-            try:
-                kes_period_info = cluster.get_kes_period_info(pool_opcert_file)
-            except clusterlib.CLIError as err:
-                if "currentlyBroken" not in str(err):
-                    raise
-                kes_query_currently_broken = True
-
-            if not kes_query_currently_broken:
-                kes.check_kes_period_info_result(
-                    kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
-                )
+            kes_period_info = cluster.get_kes_period_info(pool_opcert_file)
+            kes.check_kes_period_info_result(
+                kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
+            )
 
             # check that the balance for source address was correctly updated
             assert src_dereg_balance - tx_raw_output.fee == cluster.get_address_balance(
@@ -880,11 +871,10 @@ def test_deregister_reward_addr_retire_pool(  # noqa: C901
 
             # check command kes-period-info case: re-register pool, check without
             # waiting to take effect
-            if not kes_query_currently_broken:
-                kes_period_info = cluster.get_kes_period_info(pool_opcert_file)
-                kes.check_kes_period_info_result(
-                    kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
-                )
+            kes_period_info = cluster.get_kes_period_info(pool_opcert_file)
+            kes.check_kes_period_info_result(
+                kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
+            )
 
             # check that the balance for source address was correctly updated and that the
             # pool deposit was needed
@@ -905,11 +895,10 @@ def test_deregister_reward_addr_retire_pool(  # noqa: C901
                 raise AssertionError(f"Stake pool `{pool_id}` not registered even after 5 epochs.")
 
             # check command kes-period-info case: re-register pool
-            if not kes_query_currently_broken:
-                kes_period_info = cluster.get_kes_period_info(pool_opcert_file)
-                kes.check_kes_period_info_result(
-                    kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
-                )
+            kes_period_info = cluster.get_kes_period_info(pool_opcert_file)
+            kes.check_kes_period_info_result(
+                kes_output=kes_period_info, expected_scenario=kes.KesScenarios.ALL_VALID
+            )
 
             # wait before checking delegation and rewards
             cluster.wait_for_new_epoch(3, padding_seconds=30)