diff --git a/e2e/tests-dfx/info.bash b/e2e/tests-dfx/info.bash index cd60d1ed08..18ab002888 100644 --- a/e2e/tests-dfx/info.bash +++ b/e2e/tests-dfx/info.bash @@ -22,7 +22,7 @@ teardown() { assert_command dfx info replica-port if [[ "$USE_POCKETIC" ]] then - assert_eq "$(get_pocketic_port)" + assert_eq "$(get_webserver_port)" else assert_eq "$(get_replica_port)" fi diff --git a/e2e/tests-dfx/start.bash b/e2e/tests-dfx/start.bash index 417a84f180..b359f794c4 100644 --- a/e2e/tests-dfx/start.bash +++ b/e2e/tests-dfx/start.bash @@ -266,6 +266,7 @@ teardown() { } @test "dfx start honors replica port configuration" { + [[ "$USE_POCKETIC" ]] && skip 'skipped for pocketic: real replica port' create_networks_json replica_port=$(get_ephemeral_port) jq ".local.replica.port=$replica_port" "$E2E_NETWORKS_JSON" | sponge "$E2E_NETWORKS_JSON" diff --git a/src/dfx/src/commands/info/replica_port.rs b/src/dfx/src/commands/info/replica_port.rs index 8dc4ebd149..ba8589cab4 100644 --- a/src/dfx/src/commands/info/replica_port.rs +++ b/src/dfx/src/commands/info/replica_port.rs @@ -1,7 +1,10 @@ use crate::lib::error::DfxResult; use crate::Environment; use anyhow::bail; -use dfx_core::network::provider::{create_network_descriptor, LocalBindDetermination}; +use dfx_core::{ + config::model::replica_config::CachedReplicaConfig, + network::provider::{create_network_descriptor, LocalBindDetermination}, +}; pub(crate) fn get_replica_port(env: &dyn Environment) -> DfxResult { let network_descriptor = create_network_descriptor( @@ -11,6 +14,13 @@ pub(crate) fn get_replica_port(env: &dyn Environment) -> DfxResult { None, LocalBindDetermination::AsConfigured, )?; + if let Some(l) = &network_descriptor.local_server_descriptor { + if l.effective_config()? + .is_some_and(|c| matches!(c.config, CachedReplicaConfig::PocketIc { .. })) + { + return super::get_webserver_port(env); + } + } let logger = None; if let Some(port) = network_descriptor