Skip to content

Commit 4a609f5

Browse files
committed
Revert "Sync server discovery integration spec tests"
This reverts commit 4a08efb. JAVA-4677
1 parent 4a08efb commit 4a609f5

File tree

4 files changed

+38
-19
lines changed

4 files changed

+38
-19
lines changed

driver-core/src/test/resources/server-discovery-and-monitoring-integration/hello-command-error.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"failPoint": {
118118
"configureFailPoint": "failCommand",
119119
"mode": {
120-
"times": 4
120+
"times": 2
121121
},
122122
"data": {
123123
"failCommands": [
@@ -162,6 +162,22 @@
162162
}
163163
]
164164
}
165+
},
166+
{
167+
"name": "assertEventCount",
168+
"object": "testRunner",
169+
"arguments": {
170+
"event": "ServerMarkedUnknownEvent",
171+
"count": 1
172+
}
173+
},
174+
{
175+
"name": "assertEventCount",
176+
"object": "testRunner",
177+
"arguments": {
178+
"event": "PoolClearedEvent",
179+
"count": 1
180+
}
165181
}
166182
],
167183
"expectations": [

driver-core/src/test/resources/server-discovery-and-monitoring-integration/hello-network-error.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"failPoint": {
117117
"configureFailPoint": "failCommand",
118118
"mode": {
119-
"times": 4
119+
"times": 2
120120
},
121121
"data": {
122122
"failCommands": [

driver-core/src/test/resources/server-discovery-and-monitoring-integration/hello-timeout.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"failPoint": {
118118
"configureFailPoint": "failCommand",
119119
"mode": {
120-
"times": 4
120+
"times": 2
121121
},
122122
"data": {
123123
"failCommands": [
@@ -160,6 +160,22 @@
160160
}
161161
]
162162
}
163+
},
164+
{
165+
"name": "assertEventCount",
166+
"object": "testRunner",
167+
"arguments": {
168+
"event": "ServerMarkedUnknownEvent",
169+
"count": 1
170+
}
171+
},
172+
{
173+
"name": "assertEventCount",
174+
"object": "testRunner",
175+
"arguments": {
176+
"event": "PoolClearedEvent",
177+
"count": 1
178+
}
163179
}
164180
],
165181
"expectations": [

driver-core/src/test/resources/server-discovery-and-monitoring-integration/rediscover-quickly-after-step-down.json

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,14 @@
4545
"name": "recordPrimary",
4646
"object": "testRunner"
4747
},
48-
{
49-
"name": "runAdminCommand",
50-
"object": "testRunner",
51-
"command_name": "replSetFreeze",
52-
"arguments": {
53-
"command": {
54-
"replSetFreeze": 0
55-
},
56-
"readPreference": {
57-
"mode": "Secondary"
58-
}
59-
}
60-
},
6148
{
6249
"name": "runAdminCommand",
6350
"object": "testRunner",
6451
"command_name": "replSetStepDown",
6552
"arguments": {
6653
"command": {
67-
"replSetStepDown": 30,
68-
"secondaryCatchUpPeriodSecs": 30,
54+
"replSetStepDown": 1,
55+
"secondaryCatchUpPeriodSecs": 1,
6956
"force": false
7057
}
7158
}
@@ -74,7 +61,7 @@
7461
"name": "waitForPrimaryChange",
7562
"object": "testRunner",
7663
"arguments": {
77-
"timeoutMS": 15000
64+
"timeoutMS": 5000
7865
}
7966
},
8067
{

0 commit comments

Comments
 (0)