Skip to content

Commit 1b94721

Browse files
DmitryLukyanovDmitryLukyanov
committed
CSHARP-2883: Define how multiple phases should be handled in SDAM spec runner.
1 parent f7a8692 commit 1b94721

File tree

10 files changed

+238
-49
lines changed

10 files changed

+238
-49
lines changed

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.json‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"description": "Monitoring a discovered standalone connection",
3+
"uri": "mongodb://a:27017/?directConnection=false",
4+
"phases": [
5+
{
6+
"responses": [
7+
[
8+
"a:27017",
9+
{
10+
"ok": 1,
11+
"ismaster": true,
12+
"minWireVersion": 0,
13+
"maxWireVersion": 4
14+
}
15+
]
16+
],
17+
"outcome": {
18+
"events": [
19+
{
20+
"topology_opening_event": {
21+
"topologyId": "42"
22+
}
23+
},
24+
{
25+
"topology_description_changed_event": {
26+
"topologyId": "42",
27+
"previousDescription": {
28+
"topologyType": "Unknown",
29+
"servers": []
30+
},
31+
"newDescription": {
32+
"topologyType": "Unknown",
33+
"servers": [
34+
{
35+
"address": "a:27017",
36+
"arbiters": [],
37+
"hosts": [],
38+
"passives": [],
39+
"type": "Unknown"
40+
}
41+
]
42+
}
43+
}
44+
},
45+
{
46+
"server_opening_event": {
47+
"topologyId": "42",
48+
"address": "a:27017"
49+
}
50+
},
51+
{
52+
"server_description_changed_event": {
53+
"topologyId": "42",
54+
"address": "a:27017",
55+
"previousDescription": {
56+
"address": "a:27017",
57+
"arbiters": [],
58+
"hosts": [],
59+
"passives": [],
60+
"type": "Unknown"
61+
},
62+
"newDescription": {
63+
"address": "a:27017",
64+
"arbiters": [],
65+
"hosts": [],
66+
"passives": [],
67+
"type": "Standalone"
68+
}
69+
}
70+
},
71+
{
72+
"topology_description_changed_event": {
73+
"topologyId": "42",
74+
"previousDescription": {
75+
"topologyType": "Unknown",
76+
"servers": [
77+
{
78+
"address": "a:27017",
79+
"arbiters": [],
80+
"hosts": [],
81+
"passives": [],
82+
"type": "Unknown"
83+
}
84+
]
85+
},
86+
"newDescription": {
87+
"topologyType": "Single",
88+
"servers": [
89+
{
90+
"address": "a:27017",
91+
"arbiters": [],
92+
"hosts": [],
93+
"passives": [],
94+
"type": "Standalone"
95+
}
96+
]
97+
}
98+
}
99+
}
100+
]
101+
}
102+
}
103+
]
104+
}

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
description: "Monitoring a discovered standalone connection"
2+
uri: "mongodb://a:27017/?directConnection=false"
3+
phases:
4+
-
5+
responses:
6+
-
7+
- "a:27017"
8+
- { ok: 1, ismaster: true, minWireVersion: 0, maxWireVersion: 4 }
9+
10+
outcome:
11+
events:
12+
-
13+
topology_opening_event:
14+
topologyId: "42"
15+
-
16+
topology_description_changed_event:
17+
topologyId: "42"
18+
previousDescription:
19+
topologyType: "Unknown"
20+
servers: []
21+
newDescription:
22+
topologyType: "Unknown"
23+
servers:
24+
-
25+
address: "a:27017"
26+
arbiters: []
27+
hosts: []
28+
passives: []
29+
type: "Unknown"
30+
-
31+
server_opening_event:
32+
topologyId: "42"
33+
address: "a:27017"
34+
-
35+
server_description_changed_event:
36+
topologyId: "42"
37+
address: "a:27017"
38+
previousDescription:
39+
address: "a:27017"
40+
arbiters: []
41+
hosts: []
42+
passives: []
43+
type: "Unknown"
44+
newDescription:
45+
address: "a:27017"
46+
arbiters: []
47+
hosts: []
48+
passives: []
49+
type: "Standalone"
50+
-
51+
topology_description_changed_event:
52+
topologyId: "42"
53+
previousDescription:
54+
topologyType: "Unknown"
55+
servers:
56+
-
57+
address: "a:27017"
58+
arbiters: []
59+
hosts: []
60+
passives: []
61+
type: "Unknown"
62+
newDescription:
63+
topologyType: "Single"
64+
servers:
65+
-
66+
address: "a:27017"
67+
arbiters: []
68+
hosts: []
69+
passives: []
70+
type: "Standalone"

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/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",

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.yml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,7 @@ description: "Monitoring a replica set with non member"
22
uri: "mongodb://a,b/"
33
phases:
44
-
5-
responses:
6-
-
7-
- "a:27017"
8-
- {
9-
ok: 1,
10-
ismaster: true,
11-
setName: "rs",
12-
setVersion: 1.0,
13-
primary: "a:27017",
14-
hosts: [ "a:27017" ],
15-
minWireVersion: 0,
16-
maxWireVersion: 4
17-
}
18-
-
19-
- "b:27017"
20-
- { ok: 1, ismaster: true }
5+
responses: []
216
outcome:
227
events:
238
-
@@ -52,6 +37,25 @@ phases:
5237
server_opening_event:
5338
topologyId: "42"
5439
address: "b:27017"
40+
-
41+
responses:
42+
-
43+
- "a:27017"
44+
- {
45+
ok: 1,
46+
ismaster: true,
47+
setName: "rs",
48+
setVersion: 1.0,
49+
primary: "a:27017",
50+
hosts: [ "a:27017" ],
51+
minWireVersion: 0,
52+
maxWireVersion: 4
53+
}
54+
-
55+
- "b:27017"
56+
- { ok: 1, ismaster: true }
57+
outcome:
58+
events:
5559
-
5660
server_description_changed_event:
5761
topologyId: "42"

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
},
3838
"newDescription": {
3939
"topologyType": "ReplicaSetNoPrimary",
40+
"setName": "rs",
4041
"servers": [
4142
{
4243
"address": "a:27017",
@@ -98,6 +99,7 @@
9899
"topologyId": "42",
99100
"previousDescription": {
100101
"topologyType": "ReplicaSetNoPrimary",
102+
"setName": "rs",
101103
"servers": [
102104
{
103105
"address": "a:27017",

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ phases:
2828
servers: []
2929
newDescription:
3030
topologyType: "ReplicaSetNoPrimary"
31+
setName: "rs"
3132
servers:
3233
-
3334
address: "a:27017"
@@ -72,6 +73,7 @@ phases:
7273
topologyId: "42"
7374
previousDescription:
7475
topologyType: "ReplicaSetNoPrimary"
76+
setName: "rs"
7577
servers:
7678
-
7779
address: "a:27017"

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/standalone.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"description": "Monitoring a standalone connection",
3-
"uri": "mongodb://a:27017",
2+
"description": "Monitoring a direct connection",
3+
"uri": "mongodb://a:27017/?directConnection=true",
44
"phases": [
55
{
66
"responses": [

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/standalone.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
description: "Monitoring a standalone connection"
2-
uri: "mongodb://a:27017"
1+
description: "Monitoring a direct connection"
2+
uri: "mongodb://a:27017/?directConnection=true"
33
phases:
44
-
55
responses:

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"description": "Monitoring a standalone connection - suppress update events for equal server descriptions",
3-
"uri": "mongodb://a:27017",
2+
"description": "Monitoring a direct connection - suppress update events for equal server descriptions",
3+
"uri": "mongodb://a:27017/?directConnection=true",
44
"phases": [
55
{
66
"responses": [

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
description: "Monitoring a standalone connection - suppress update events for equal server descriptions"
2-
uri: "mongodb://a:27017"
1+
description: "Monitoring a direct connection - suppress update events for equal server descriptions"
2+
uri: "mongodb://a:27017/?directConnection=true"
33
phases:
44
-
55
responses:

0 commit comments

Comments
 (0)