Merge pull request #876 from mkoura/fix_testrun_1.33.1

Fixes for testrun on node 1.33.1
IntersectMBO · Jan 18, 2022 · 7a065a4 · 7a065a4
2 parents fb86dc3 + c14dbb3
commit 7a065a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/cardano_node_tests/tests/test_kes.py b/cardano_node_tests/tests/test_kes.py
@@ -138,8 +138,10 @@ def test_expired_kes(
             kes_period_timeout = int(cluster.slots_per_kes_period * cluster.slot_length + 1)
             LOGGER.info(f"Waiting for {kes_period_timeout} sec for next KES period.")
             time.sleep(kes_period_timeout)
+            assert cluster.get_slot_no() == init_slot, "Unexpected new slots"
 
-        assert cluster.get_slot_no() == init_slot, "Unexpected new slots"
+            LOGGER.info("Waiting 120 secs to make sure the expected errors make it to log files.")
+            time.sleep(120)
 
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.order(6)

diff --git a/cardano_node_tests/tests/test_staking.py b/cardano_node_tests/tests/test_staking.py
@@ -881,25 +881,17 @@ def _mir_tx(fund_src: str) -> clusterlib.TxRawOutput:
                     *cluster.genesis_keys.delegate_skeys,
                 ],
             )
-            mir_tx_raw_output = cluster.build_tx(
-                src_address=pool_owner.payment.address,
-                tx_name=f"{temp_template}_{fund_src}",
-                tx_files=mir_tx_files,
-                fee_buffer=1000_000,
-                witness_override=2,
-            )
-            mir_tx_signed = cluster.sign_tx(
-                tx_body_file=mir_tx_raw_output.out_file,
-                signing_key_files=mir_tx_files.signing_key_files,
-                tx_name=f"{temp_template}_{fund_src}",
-            )
 
             LOGGER.info(
                 f"Submitting MIR cert for tranferring funds from {fund_src} to "
                 f"'{pool_reward.stake.address}' in epoch {cluster.get_epoch()} "
                 f"on cluster instance {cluster_manager.cluster_instance_num}"
             )
-            cluster.submit_tx(tx_file=mir_tx_signed, txins=mir_tx_raw_output.txins)
+            mir_tx_raw_output = cluster.send_tx(
+                src_address=pool_owner.payment.address,
+                tx_name=f"{temp_template}_{fund_src}",
+                tx_files=mir_tx_files,
+            )
 
             return mir_tx_raw_output