Skip to content

Commit 45f4545

Browse files
blink1073blink1073
committed
update unified tests
1 parent 5820cac commit 45f4545

File tree

4 files changed

+123
-67
lines changed

4 files changed

+123
-67
lines changed

‎test/discovery_and_monitoring/unified/backpressure-network-error-fail.json‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,12 @@
4949
"useMultipleMongoses": false,
5050
"observeEvents": [
5151
"serverHeartbeatSucceededEvent",
52-
"serverDescriptionChangedEvent",
53-
"poolReadyEvent",
5452
"poolClearedEvent"
5553
],
5654
"uriOptions": {
5755
"retryWrites": false,
58-
"heartbeatFrequencyMS": 10000,
56+
"heartbeatFrequencyMS": 1000000,
5957
"serverMonitoringMode": "poll",
60-
"directConnection": true,
6158
"appname": "backpressureNetworkErrorFailTest"
6259
}
6360
}
@@ -90,17 +87,6 @@
9087
"count": 1
9188
}
9289
},
93-
{
94-
"name": "waitForEvent",
95-
"object": "testRunner",
96-
"arguments": {
97-
"client": "client",
98-
"event": {
99-
"serverDescriptionChangedEvent": {}
100-
},
101-
"count": 1
102-
}
103-
},
10490
{
10591
"name": "failPoint",
10692
"object": "testRunner",
@@ -146,24 +132,7 @@
146132
{
147133
"client": "client",
148134
"eventType": "cmap",
149-
"events": [
150-
{
151-
"poolReadyEvent": {}
152-
}
153-
]
154-
},
155-
{
156-
"client": "client",
157-
"eventType": "sdam",
158-
"ignoreExtraEvents": false,
159-
"events": [
160-
{
161-
"serverHeartbeatSucceededEvent": {}
162-
},
163-
{
164-
"serverDescriptionChangedEvent": {}
165-
}
166-
]
135+
"events": []
167136
}
168137
]
169138
}

‎test/discovery_and_monitoring/unified/backpressure-network-timeout-fail.json‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,14 @@
4848
"id": "client",
4949
"useMultipleMongoses": false,
5050
"observeEvents": [
51-
"serverHeartbeatSucceededEvent",
5251
"serverDescriptionChangedEvent",
53-
"poolReadyEvent",
5452
"poolClearedEvent"
5553
],
5654
"uriOptions": {
5755
"retryWrites": false,
58-
"heartbeatFrequencyMS": 10000,
56+
"heartbeatFrequencyMS": 1000000,
5957
"appname": "backpressureNetworkTimeoutErrorTest",
6058
"serverMonitoringMode": "poll",
61-
"directConnection": true,
6259
"connectTimeoutMS": 250,
6360
"socketTimeoutMS": 250
6461
}
@@ -81,17 +78,6 @@
8178
]
8279
}
8380
},
84-
{
85-
"name": "waitForEvent",
86-
"object": "testRunner",
87-
"arguments": {
88-
"client": "client",
89-
"event": {
90-
"serverHeartbeatSucceededEvent": {}
91-
},
92-
"count": 1
93-
}
94-
},
9581
{
9682
"name": "waitForEvent",
9783
"object": "testRunner",
@@ -149,24 +135,7 @@
149135
{
150136
"client": "client",
151137
"eventType": "cmap",
152-
"events": [
153-
{
154-
"poolReadyEvent": {}
155-
}
156-
]
157-
},
158-
{
159-
"client": "client",
160-
"eventType": "sdam",
161-
"ignoreExtraEvents": false,
162-
"events": [
163-
{
164-
"serverHeartbeatSucceededEvent": {}
165-
},
166-
{
167-
"serverDescriptionChangedEvent": {}
168-
}
169-
]
138+
"events": []
170139
}
171140
]
172141
}

‎test/discovery_and_monitoring/unified/backpressure-pool-no-clear-min-pool-size-error.json‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"description": "backpressure-pool-not-cleared-on-min-pool-size-population-error",
3+
"schemaVersion": "1.4",
4+
"runOnRequirements": [
5+
{
6+
"minServerVersion": "4.4",
7+
"serverless": "forbid",
8+
"topologies": [
9+
"single"
10+
]
11+
}
12+
],
13+
"createEntities": [
14+
{
15+
"client": {
16+
"id": "setupClient",
17+
"useMultipleMongoses": false
18+
}
19+
}
20+
],
21+
"tests": [
22+
{
23+
"description": "Pool is not cleared on handshake error during minPoolSize population",
24+
"operations": [
25+
{
26+
"name": "createEntities",
27+
"object": "testRunner",
28+
"arguments": {
29+
"entities": [
30+
{
31+
"client": {
32+
"id": "client",
33+
"observeEvents": [
34+
"serverDescriptionChangedEvent",
35+
"connectionCreatedEvent",
36+
"poolClearedEvent",
37+
"connectionClosedEvent",
38+
"connectionReadyEvent"
39+
],
40+
"uriOptions": {
41+
"appname": "authErrorTest",
42+
"minPoolSize": 5,
43+
"maxConnecting": 1,
44+
"serverMonitoringMode": "poll",
45+
"heartbeatFrequencyMS": 1000000
46+
}
47+
}
48+
}
49+
]
50+
}
51+
},
52+
{
53+
"name": "failPoint",
54+
"object": "testRunner",
55+
"arguments": {
56+
"client": "setupClient",
57+
"failPoint": {
58+
"configureFailPoint": "failCommand",
59+
"mode": {
60+
"skip": 1
61+
},
62+
"data": {
63+
"failCommands": [
64+
"hello",
65+
"isMaster"
66+
],
67+
"appName": "authErrorTest",
68+
"closeConnection": true
69+
}
70+
}
71+
}
72+
},
73+
{
74+
"name": "waitForEvent",
75+
"object": "testRunner",
76+
"arguments": {
77+
"client": "client",
78+
"event": {
79+
"serverDescriptionChangedEvent": {}
80+
},
81+
"count": 1
82+
}
83+
},
84+
{
85+
"name": "waitForEvent",
86+
"object": "testRunner",
87+
"arguments": {
88+
"client": "client",
89+
"event": {
90+
"connectionClosedEvent": {}
91+
},
92+
"count": 1
93+
}
94+
}
95+
],
96+
"expectEvents": [
97+
{
98+
"client": "client",
99+
"eventType": "cmap",
100+
"events": [
101+
{
102+
"connectionCreatedEvent": {}
103+
},
104+
{
105+
"connectionReadyEvent": {}
106+
},
107+
{
108+
"connectionCreatedEvent": {}
109+
},
110+
{
111+
"connectionClosedEvent": {}
112+
}
113+
]
114+
}
115+
]
116+
}
117+
]
118+
}

‎test/discovery_and_monitoring/unified/hello-timeout.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"useMultipleMongoses": false,
177177
"observeEvents": [
178178
"commandStartedEvent",
179-
"serverDescriptionChangedEvent",
179+
"serverHeartbeatSucceededEvent",
180180
"poolClearedEvent"
181181
],
182182
"uriOptions": {

0 commit comments

Comments
 (0)