Merge branch 'master' into build_method_test_conway

Author: OlufemiAdeOlusile

cardano_node_tests/tests/test_pools.py

@@ -2470,9 +2470,9 @@ def test_stake_pool_metadata_long_homepage(
 
     @allure.link(helpers.get_vcs_link())
     @hypothesis.given(
-        metadata_url=st.text(alphabet=st.characters(blacklist_categories=["C"]), min_size=25)
+        url_part=st.text(alphabet=st.characters(blacklist_categories=["C"]), min_size=89)
     )
-    @common.hypothesis_settings()
+    @common.hypothesis_settings(max_examples=500)
     @pytest.mark.smoke
     @pytest.mark.testnets
     def test_stake_pool_long_metadata_url(
@@ -2482,22 +2482,25 @@ def test_stake_pool_long_metadata_url(
         gen_pool_registration_cert_data: tuple[
             str, str, clusterlib.KeyPair, clusterlib.ColdKeyPair
         ],
-        metadata_url: str,
+        url_part: str,
     ):
         """Try to create pool registration cert when the *metadata-url* is longer than allowed.
 
         Expect failure. Property-based test.
         """
         common.get_test_id(cluster)
 
+        pool_metadata_url = f"https://gist.githubusercontent.com/{url_part}.json"
+        assert len(pool_metadata_url) >= 129
+
         pool_name, pool_metadata_hash, node_vrf, node_cold = gen_pool_registration_cert_data
 
         pool_data = clusterlib.PoolData(
             pool_name=pool_name,
             pool_pledge=1_000,
             pool_cost=500_000_000,
             pool_margin=0.2,
-            pool_metadata_url=f"https://gist.githubusercontent.com/{metadata_url}.json",
+            pool_metadata_url=pool_metadata_url,
             pool_metadata_hash=pool_metadata_hash,
         )
 
@@ -2509,8 +2512,13 @@ def test_stake_pool_long_metadata_url(
                 cold_vkey_file=node_cold.vkey_file,
                 owner_stake_vkey_files=[p.stake.vkey_file for p in pool_users],
             )
-        assert "option --metadata-url: The provided string must have at most 64 characters" in str(
-            excinfo.value
+        err_str = str(excinfo.value)
+        assert (
+            "option --metadata-url: The provided string must have at most 128 characters" in err_str
+            or "invalid url" in err_str
+            # In cardano-node <= 10.6.0
+            or "option --metadata-url: The provided string must have at most 64 characters"
+            in err_str
         )
 
 

cardano_node_tests/tests/tests_conway/test_conway.py

@@ -73,7 +73,7 @@ def _run_test_action_unreg_deposit_addr(
         cluster: clusterlib.ClusterLib,
         temp_template: str,
         pool_user: clusterlib.PoolUser,
-        build_method: str,
+        use_build_cmd: bool,
         submit_method: str = submit_utils.SubmitMethods.CLI,
     ):
         """Run the actual scenario of the 'test_action_unreg_deposit_addr*' tests."""
@@ -104,50 +104,62 @@ def _run_test_action_unreg_deposit_addr(
                 name_template=f"{temp_template}_action",
                 src_address=pool_user.payment.address,
                 submit_method=submit_method,
-                build_method=build_method,
+                use_build_cmd=use_build_cmd,
                 tx_files=tx_files_action,
             )
         err_str = str(excinfo.value)
-        if build_method in (
-            clusterlib_utils.BuildMethods.BUILD,
-            clusterlib_utils.BuildMethods.BUILD_EST,
-        ):
+        if use_build_cmd:
             assert (
                 "Stake credential specified in the proposal is not registered on-chain" in err_str
-                or "ProposalReturnAccountDoesNotExist" in err_str  # For node <= 10.1.4
+                or "ProposalReturnAccountDoesNotExist" in err_str  # In node <= 10.1.4
             ), err_str
-        elif build_method == clusterlib_utils.BuildMethods.BUILD_RAW:
-            assert "ProposalReturnAccountDoesNotExist" in err_str, err_str
         else:
-            msg = f"Unsupported build method: {build_method}"
-            raise ValueError(msg)
+            assert "ProposalReturnAccountDoesNotExist" in err_str, err_str
 
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_BUILD_METHOD_NO_EST
     @submit_utils.PARAM_SUBMIT_METHOD
     @pytest.mark.smoke
-    def test_action_unreg_deposit_addr(
+    def test_action_submit_unreg_deposit_addr(
         self,
         cluster: clusterlib.ClusterLib,
         pool_user: clusterlib.PoolUser,
-        build_method: str,
         submit_method: str,
     ):
-        """Test creating or submitting an action with an unregistered deposit return address.
+        """Test submitting an action with an unregistered deposit return address.
 
         Expect failure.
 
-        * `transaction build` - fails at build time because the deposit return stake credential
-          is not registered.
-        * `transaction build-estimate` - behaves like `build`, fails at build time.
-        * `transaction build-raw` - does not check during build; transaction is expected
-          to fail on submission.
+        The transaction is built using `transaction build-raw`, which does not check
+        deposit return address registration. The transaction is expected to fail on submission.
         """
         temp_template = common.get_test_id(cluster)
         return self._run_test_action_unreg_deposit_addr(
             cluster=cluster,
             temp_template=temp_template,
             pool_user=pool_user,
-            build_method=build_method,
+            use_build_cmd=False,
             submit_method=submit_method,
         )
+
+    @allure.link(helpers.get_vcs_link())
+    @common.SKIPIF_BUILD_UNUSABLE
+    @pytest.mark.smoke
+    def test_action_build_unreg_deposit_addr(
+        self,
+        cluster: clusterlib.ClusterLib,
+        pool_user: clusterlib.PoolUser,
+    ):
+        """Test building a Tx when deposit return address is unregistered.
+
+        Expect failure.
+
+        The `transaction build` command checks deposit return address registration
+        during Tx building, causing the build to fail.
+        """
+        temp_template = common.get_test_id(cluster)
+        return self._run_test_action_unreg_deposit_addr(
+            cluster=cluster,
+            temp_template=temp_template,
+            pool_user=pool_user,
+            use_build_cmd=True,
+        )

cardano_node_tests/tests/tests_conway/test_info.py

@@ -110,7 +110,7 @@ def test_info(
             cluster_obj=cluster,
             name_template=f"{temp_template}_action",
             src_address=pool_user_ug.payment.address,
-            use_build_cmd=True,
+            build_method=clusterlib_utils.BuildMethods.BUILD,
             tx_files=tx_files_action,
         )
         reqc.cli023.success()
@@ -202,7 +202,7 @@ def test_info(
             payment_addr=pool_user_ug.payment,
             votes=votes,
             keys=vote_keys,
-            use_build_cmd=True,
+            build_method=clusterlib_utils.BuildMethods.BUILD,
         )
         reqc.cli024.success()