test: fix integration tests

test/conftest.py

@@ -433,7 +433,8 @@ class Instance:
 
         myself = self.call("picolib.peer_info", self.instance_id)
         assert isinstance(myself, dict)
-        assert myself["current_grade"] == "Online"
+        assert isinstance(myself["current_grade"], dict)
+        assert myself["current_grade"]["variant"] == "Online"
 
         eprint(f"{self} is online")
 

test/int/test_basics.py

@@ -217,20 +217,20 @@ 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, 1, {b})|
+|  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  |     |Promote(1)|
 |  5  | 2  |     |-|
-|  6  | 2  |1.1.2|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Offline -> Online, 6, {b})|
-|  7  | 2  |1.1.3|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, RaftSynced -> Online, 7, {b})|
-|  8  | 2  |1.1.4|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Replicated -> Online, 8, {b})|
+|  6  | 2  |1.1.2|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Offline(0) -> Online(1), 6, {b})|
+|  7  | 2  |1.1.3|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, RaftSynced(1) -> Online(1), 7, {b})|
+|  8  | 2  |1.1.4|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Replicated(1) -> Online(1), 8, {b})|
 |  9  | 2  |1.1.5|Insert(replicasets, ["r1","e0df68c5-e7f9-395f-86b3-30ad9e1b7b07","i1",1.0,0])|
-| 10  | 2  |1.1.6|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, ShardingInitialized -> Online, 10, {b})|
+| 10  | 2  |1.1.6|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, ShardingInitialized(1) -> Online(1), 10, {b})|
 | 11  | 2  |1.1.7|Replace(cluster_state, ["vshard_bootstrapped",true])|
-| 12  | 2  |1.1.8|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Online, 12, {b})|
+| 12  | 2  |1.1.8|PersistPeer(i1, 1, r1, 127.0.0.1:{p}, Online(1), 12, {b})|
 +-----+----+-----+--------+
-""".format(
+""".format(  # noqa: E501
         p=instance.port, b="{}"
     )
     assert strip_spaces(expected) == strip_spaces(raft_log)

test/int/test_expelling.py

@@ -10,7 +10,7 @@ def cluster3(cluster: Cluster):
 
 def assert_peer_expelled(expelled_peer: Instance, instance: Instance):
     current_grade = instance.eval(
-        "return box.space.raft_group.index.instance_id:get(...).current_grade",
+        "return picolib.peer_info(...).current_grade.variant",
         expelled_peer.instance_id,
     )
     assert current_grade == "Expelled"

test/int/test_joining.py

@@ -152,8 +152,8 @@ def test_replication(cluster: Cluster):
             "peer_address": instance.eval("return box.info.listen"),
             "replicaset_id": "r1",
             "replicaset_uuid": instance.eval("return box.info.cluster.uuid"),
-            "current_grade": "Online",
-            "target_grade": "Online",
+            "current_grade": ["Online", 1],
+            "target_grade": ["Online", 1],
             "failure_domain": dict(),
         }
         assert {k: v for k, v in raft_peer.items() if k in expected} == expected