Skip to content

Commit 3f2b6ce

Browse files
committed
Define how multiple phases should be handled in SDAM spec runner
JAVA-3561
1 parent 872ed40 commit 3f2b6ce

File tree

7 files changed

+303
-280
lines changed

7 files changed

+303
-280
lines changed

driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_no_primary.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"setVersion": 1,
1515
"primary": "b:27017",
1616
"hosts": [
17-
"a:27017", "b:27017"
17+
"a:27017",
18+
"b:27017"
1819
],
1920
"minWireVersion": 0,
2021
"maxWireVersion": 4
@@ -83,7 +84,8 @@
8384
"address": "a:27017",
8485
"arbiters": [],
8586
"hosts": [
86-
"a:27017", "b:27017"
87+
"a:27017",
88+
"b:27017"
8789
],
8890
"passives": [],
8991
"primary": "b:27017",
@@ -122,7 +124,8 @@
122124
"address": "a:27017",
123125
"arbiters": [],
124126
"hosts": [
125-
"a:27017", "b:27017"
127+
"a:27017",
128+
"b:27017"
126129
],
127130
"passives": [],
128131
"primary": "b:27017",

driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_primary.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"setVersion": 1,
1414
"primary": "a:27017",
1515
"hosts": [
16-
"a:27017", "b:27017"
16+
"a:27017",
17+
"b:27017"
1718
],
1819
"minWireVersion": 0,
1920
"maxWireVersion": 4
@@ -82,7 +83,8 @@
8283
"address": "a:27017",
8384
"arbiters": [],
8485
"hosts": [
85-
"a:27017", "b:27017"
86+
"a:27017",
87+
"b:27017"
8688
],
8789
"passives": [],
8890
"primary": "a:27017",
@@ -121,7 +123,8 @@
121123
"address": "a:27017",
122124
"arbiters": [],
123125
"hosts": [
124-
"a:27017", "b:27017"
126+
"a:27017",
127+
"b:27017"
125128
],
126129
"passives": [],
127130
"primary": "a:27017",

driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_removal.json

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,7 @@
33
"uri": "mongodb://a,b/",
44
"phases": [
55
{
6-
"responses": [
7-
[
8-
"a:27017",
9-
{
10-
"ok": 1,
11-
"ismaster": true,
12-
"setName": "rs",
13-
"setVersion": 1,
14-
"primary": "a:27017",
15-
"hosts": [
16-
"a:27017"
17-
],
18-
"minWireVersion": 0,
19-
"maxWireVersion": 4
20-
}
21-
],
22-
[
23-
"b:27017",
24-
{
25-
"ok": 1,
26-
"ismaster": true
27-
}
28-
]
29-
],
6+
"responses": [],
307
"outcome": {
318
"events": [
329
{
@@ -73,7 +50,37 @@
7350
"topologyId": "42",
7451
"address": "b:27017"
7552
}
76-
},
53+
}
54+
]
55+
}
56+
},
57+
{
58+
"responses": [
59+
[
60+
"a:27017",
61+
{
62+
"ok": 1,
63+
"ismaster": true,
64+
"setName": "rs",
65+
"setVersion": 1,
66+
"primary": "a:27017",
67+
"hosts": [
68+
"a:27017"
69+
],
70+
"minWireVersion": 0,
71+
"maxWireVersion": 4
72+
}
73+
],
74+
[
75+
"b:27017",
76+
{
77+
"ok": 1,
78+
"ismaster": true
79+
}
80+
]
81+
],
82+
"outcome": {
83+
"events": [
7784
{
7885
"server_description_changed_event": {
7986
"topologyId": "42",

0 commit comments

Comments
 (0)