From 327e45a27929b31831434b624a3db1a3f3e019f6 Mon Sep 17 00:00:00 2001
From: Georgy Moshkin <gmoshkin@picodata.io>
Date: Fri, 25 Nov 2022 16:04:13 +0300
Subject: [PATCH] test: fix integration tests
---
test/int/test_basics.py | 25 +++++++++++++------------
test/int/test_joining.py | 1 -
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/test/int/test_basics.py b/test/int/test_basics.py
index 200a3e2442..9b365f8a1a 100644
--- a/test/int/test_basics.py
+++ b/test/int/test_basics.py
@@ -217,18 +217,19 @@ def test_raft_log(instance: Instance):
+-----+----+-----+--------+
|index|term| lc |contents|
+-----+----+-----+--------+
-| 1 | 1 |1.0.1|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Offline(0), 1, {b})|
-| 2 | 1 |1.0.2|Insert(cluster_state, ["replication_factor",1])|
-| 3 | 1 |1.0.3|Insert(cluster_state, ["desired_schema_version",0])|
-| 4 | 1 | |AddNode(1)|
-| 5 | 2 | |-|
-| 6 | 2 |1.1.1|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Offline(0) -> Online(1), 6, {b})|
-| 7 | 2 |1.1.2|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, RaftSynced(1) -> Online(1), 7, {b})|
-| 8 | 2 |1.1.3|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Replicated(1) -> Online(1), 8, {b})|
-| 9 | 2 |1.1.4|Insert(replicasets, ["r1","e0df68c5-e7f9-395f-86b3-30ad9e1b7b07","i1",1.0,0])|
-| 10 | 2 |1.1.5|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, ShardingInitialized(1) -> Online(1), 10, {b})|
-| 11 | 2 |1.1.6|Replace(cluster_state, ["vshard_bootstrapped",true])|
-| 12 | 2 |1.1.7|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Online(1), 12, {b})|
+| 1 | 1 |1.0.1|Insert(pico_peer_addresses, [1,"127.0.0.1:{p}"])|
+| 2 | 1 |1.0.2|PersistPeer(i1, 1, r1, Offline(0), 1, {b})|
+| 3 | 1 |1.0.3|Insert(cluster_state, ["replication_factor",1])|
+| 4 | 1 |1.0.4|Insert(cluster_state, ["desired_schema_version",0])|
+| 5 | 1 | |AddNode(1)|
+| 6 | 2 | |-|
+| 7 | 2 |1.1.1|PersistPeer(i1, 1, r1, Offline(0) -> Online(1), 7, {b})|
+| 8 | 2 |1.1.2|PersistPeer(i1, 1, r1, RaftSynced(1) -> Online(1), 8, {b})|
+| 9 | 2 |1.1.3|PersistPeer(i1, 1, r1, Replicated(1) -> Online(1), 9, {b})|
+| 10 | 2 |1.1.4|Insert(replicasets, ["r1","e0df68c5-e7f9-395f-86b3-30ad9e1b7b07","i1",1.0,0])|
+| 11 | 2 |1.1.5|PersistPeer(i1, 1, r1, ShardingInitialized(1) -> Online(1), 11, {b})|
+| 12 | 2 |1.1.6|Replace(cluster_state, ["vshard_bootstrapped",true])|
+| 13 | 2 |1.1.7|PersistPeer(i1, 1, r1, Online(1), 13, {b})|
+-----+----+-----+--------+
""".format( # noqa: E501
p=instance.port, b="{}"
diff --git a/test/int/test_joining.py b/test/int/test_joining.py
index 3fb33e2d7c..bfe4ba1c89 100644
--- a/test/int/test_joining.py
+++ b/test/int/test_joining.py
@@ -149,7 +149,6 @@ def test_replication(cluster: Cluster):
"instance_id": instance.instance_id,
"instance_uuid": instance.eval("return box.info.uuid"),
"raft_id": instance.raft_id,
- "peer_address": instance.eval("return box.info.listen"),
"replicaset_id": "r1",
"replicaset_uuid": instance.eval("return box.info.cluster.uuid"),
"current_grade": ["Online", 1],
--
GitLab