fix sharness

ipfs · Jul 21, 2023 · bf2d97b · bf2d97b
1 parent 2b4eb15
commit bf2d97b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 7 deletions.
diff --git a/test/sharness/t0026-id.sh b/test/sharness/t0026-id.sh
@@ -32,12 +32,6 @@ test_expect_success "checking AgentVersion" '
   test_cmp expected-agent-version actual-agent-version
 '
 
-test_expect_success "checking ProtocolVersion" '
-  echo "ipfs/0.1.0" > expected-protocol-version &&
-  ipfs id -f "<pver>\n" > actual-protocol-version &&
-  test_cmp expected-protocol-version actual-protocol-version
-'
-
 test_expect_success "checking ID of self" '
   ipfs config Identity.PeerID > expected-id &&
   ipfs id -f "<id>\n" > actual-id &&

diff --git a/test/sharness/t0041-ping.sh b/test/sharness/t0041-ping.sh
@@ -27,7 +27,7 @@ test_expect_success "test ping other" '
 
 test_expect_success "test ping unreachable peer" '
   printf "Looking up peer %s\n" "$BAD_PEER" > bad_ping_exp &&
-  printf "PING QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJx.\nPing error: no addresses\nError: ping failed\n" >> bad_ping_exp &&
+  printf "PING QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJx.\nPing error: failed to dial: no addresses\nError: ping failed\n" >> bad_ping_exp &&
   ! ipfsi 0 ping -n2 -- "$BAD_PEER" > bad_ping_actual 2>&1 &&
   test_cmp bad_ping_exp bad_ping_actual
 '

diff --git a/test/sharness/t0119-prometheus-data/prometheus_metrics b/test/sharness/t0119-prometheus-data/prometheus_metrics
@@ -323,6 +323,32 @@ libp2p_identify_protocols_count
 libp2p_identify_protocols_received_bucket
 libp2p_identify_protocols_received_count
 libp2p_identify_protocols_received_sum
+libp2p_rcmgr_conn_memory_bucket
+libp2p_rcmgr_conn_memory_count
+libp2p_rcmgr_conn_memory_sum
+libp2p_rcmgr_connections
+libp2p_rcmgr_fds
+libp2p_rcmgr_peer_connections_bucket
+libp2p_rcmgr_peer_connections_count
+libp2p_rcmgr_peer_connections_sum
+libp2p_rcmgr_peer_memory_bucket
+libp2p_rcmgr_peer_memory_count
+libp2p_rcmgr_peer_memory_sum
+libp2p_rcmgr_peer_streams_bucket
+libp2p_rcmgr_peer_streams_count
+libp2p_rcmgr_peer_streams_sum
+libp2p_rcmgr_previous_conn_memory_bucket
+libp2p_rcmgr_previous_conn_memory_count
+libp2p_rcmgr_previous_conn_memory_sum
+libp2p_rcmgr_previous_peer_connections_bucket
+libp2p_rcmgr_previous_peer_connections_count
+libp2p_rcmgr_previous_peer_connections_sum
+libp2p_rcmgr_previous_peer_memory_bucket
+libp2p_rcmgr_previous_peer_memory_count
+libp2p_rcmgr_previous_peer_memory_sum
+libp2p_rcmgr_previous_peer_streams_bucket
+libp2p_rcmgr_previous_peer_streams_count
+libp2p_rcmgr_previous_peer_streams_sum
 libp2p_relaysvc_connection_duration_seconds_bucket
 libp2p_relaysvc_connection_duration_seconds_count
 libp2p_relaysvc_connection_duration_seconds_sum

diff --git a/test/sharness/t0119-prometheus-data/prometheus_metrics_added_by_enabling_rcmgr b/test/sharness/t0119-prometheus-data/prometheus_metrics_added_by_enabling_rcmgr
@@ -1,4 +1,30 @@
+libp2p_rcmgr_conn_memory_bucket
+libp2p_rcmgr_conn_memory_count
+libp2p_rcmgr_conn_memory_sum
+libp2p_rcmgr_connections
+libp2p_rcmgr_fds
 libp2p_rcmgr_memory_allocations_allowed_total
 libp2p_rcmgr_memory_allocations_blocked_total
 libp2p_rcmgr_peer_blocked_total
+libp2p_rcmgr_peer_connections_bucket
+libp2p_rcmgr_peer_connections_count
+libp2p_rcmgr_peer_connections_sum
+libp2p_rcmgr_peer_memory_bucket
+libp2p_rcmgr_peer_memory_count
+libp2p_rcmgr_peer_memory_sum
+libp2p_rcmgr_peer_streams_bucket
+libp2p_rcmgr_peer_streams_count
+libp2p_rcmgr_peer_streams_sum
 libp2p_rcmgr_peers_allowed_total
+libp2p_rcmgr_previous_conn_memory_bucket
+libp2p_rcmgr_previous_conn_memory_count
+libp2p_rcmgr_previous_conn_memory_sum
+libp2p_rcmgr_previous_peer_connections_bucket
+libp2p_rcmgr_previous_peer_connections_count
+libp2p_rcmgr_previous_peer_connections_sum
+libp2p_rcmgr_previous_peer_memory_bucket
+libp2p_rcmgr_previous_peer_memory_count
+libp2p_rcmgr_previous_peer_memory_sum
+libp2p_rcmgr_previous_peer_streams_bucket
+libp2p_rcmgr_previous_peer_streams_count
+libp2p_rcmgr_previous_peer_streams_sum