Sync test changes

mongodb · Feb 9, 2022 · a3b6e02 · a3b6e02
1 parent 36ae1c9
commit a3b6e02
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 82 deletions.
diff --git a/test/spec/retryable-writes/legacy/bulkWrite-serverErrors.json b/test/spec/retryable-writes/legacy/bulkWrite-serverErrors.json
@@ -119,12 +119,12 @@
           "failCommands": [
             "insert"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/bulkWrite-serverErrors.yml b/test/spec/retryable-writes/legacy/bulkWrite-serverErrors.yml
@@ -58,10 +58,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["insert"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "bulkWrite"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/deleteOne-serverErrors.json b/test/spec/retryable-writes/legacy/deleteOne-serverErrors.json
@@ -75,12 +75,12 @@
           "failCommands": [
             "delete"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/deleteOne-serverErrors.yml b/test/spec/retryable-writes/legacy/deleteOne-serverErrors.yml
@@ -37,10 +37,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["delete"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "deleteOne"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/findOneAndDelete-serverErrors.json b/test/spec/retryable-writes/legacy/findOneAndDelete-serverErrors.json
@@ -81,12 +81,12 @@
           "failCommands": [
             "findAndModify"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/findOneAndDelete-serverErrors.yml b/test/spec/retryable-writes/legacy/findOneAndDelete-serverErrors.yml
@@ -37,10 +37,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["findAndModify"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndDelete"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/findOneAndReplace-serverErrors.json b/test/spec/retryable-writes/legacy/findOneAndReplace-serverErrors.json
@@ -85,12 +85,12 @@
           "failCommands": [
             "findAndModify"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/findOneAndReplace-serverErrors.yml b/test/spec/retryable-writes/legacy/findOneAndReplace-serverErrors.yml
@@ -39,10 +39,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["findAndModify"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndReplace"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/findOneAndUpdate-serverErrors.json b/test/spec/retryable-writes/legacy/findOneAndUpdate-serverErrors.json
@@ -86,12 +86,12 @@
           "failCommands": [
             "findAndModify"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/findOneAndUpdate-serverErrors.yml b/test/spec/retryable-writes/legacy/findOneAndUpdate-serverErrors.yml
@@ -39,10 +39,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["findAndModify"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndUpdate"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/insertMany-serverErrors.json b/test/spec/retryable-writes/legacy/insertMany-serverErrors.json
@@ -92,12 +92,12 @@
           "failCommands": [
             "insert"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/insertMany-serverErrors.yml b/test/spec/retryable-writes/legacy/insertMany-serverErrors.yml
@@ -41,10 +41,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["insert"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertMany"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/replaceOne-serverErrors.json b/test/spec/retryable-writes/legacy/replaceOne-serverErrors.json
@@ -85,12 +85,12 @@
           "failCommands": [
             "update"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/replaceOne-serverErrors.yml b/test/spec/retryable-writes/legacy/replaceOne-serverErrors.yml
@@ -41,10 +41,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["update"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "replaceOne"
             arguments:

diff --git a/test/spec/retryable-writes/legacy/updateOne-serverErrors.json b/test/spec/retryable-writes/legacy/updateOne-serverErrors.json
@@ -86,12 +86,12 @@
           "failCommands": [
             "update"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/retryable-writes/legacy/updateOne-serverErrors.yml b/test/spec/retryable-writes/legacy/updateOne-serverErrors.yml
@@ -41,10 +41,10 @@ tests:
             mode: { times: 1 }
             data:
                 failCommands: ["update"]
+                errorLabels: ["RetryableWriteError"]
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
-                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "updateOne"
             arguments:

diff --git a/test/spec/transactions/legacy/error-labels.json b/test/spec/transactions/legacy/error-labels.json
@@ -963,12 +963,12 @@
           "failCommands": [
             "commitTransaction"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errmsg": "Replication is being shut down",
-            "errorLabels": [
-              "RetryableWriteError"
-            ]
+            "errmsg": "Replication is being shut down"
           }
         }
       },

diff --git a/test/spec/transactions/legacy/error-labels.yml b/test/spec/transactions/legacy/error-labels.yml
@@ -590,10 +590,10 @@ tests:
       mode: { times: 2 }
       data:
           failCommands: ["commitTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 91
             errmsg: Replication is being shut down
-            errorLabels: ["RetryableWriteError"]
 
     operations:
       - name: startTransaction

diff --git a/test/spec/transactions/legacy/mongos-recovery-token.json b/test/spec/transactions/legacy/mongos-recovery-token.json
@@ -180,12 +180,12 @@
                 "failCommands": [
                   "commitTransaction"
                 ],
+                "errorLabels": [
+                  "RetryableWriteError"
+                ],
                 "writeConcernError": {
                   "code": 91,
-                  "errmsg": "Replication is being shut down",
-                  "errorLabels": [
-                    "RetryableWriteError"
-                  ]
+                  "errmsg": "Replication is being shut down"
                 }
               }
             }

diff --git a/test/spec/transactions/legacy/mongos-recovery-token.yml b/test/spec/transactions/legacy/mongos-recovery-token.yml
@@ -118,10 +118,10 @@ tests:
             mode: { times: 1 }
             data:
               failCommands: ["commitTransaction"]
+              errorLabels: ["RetryableWriteError"]
               writeConcernError:
                 code: 91
                 errmsg: Replication is being shut down
-                errorLabels: ["RetryableWriteError"]
       # The client sees a retryable writeConcernError on the first
       # commitTransaction due to the fail point but it actually succeeds on the
       # server (SERVER-39346). The retry will succeed both on a new mongos and

diff --git a/test/spec/transactions/legacy/retryable-abort.json b/test/spec/transactions/legacy/retryable-abort.json
@@ -1556,11 +1556,11 @@
           "failCommands": [
             "abortTransaction"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 11600,
-            "errorLabels": [
-              "RetryableWriteError"
-            ],
             "errmsg": "Replication is being shut down"
           }
         }
@@ -1673,11 +1673,11 @@
           "failCommands": [
             "abortTransaction"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 11602,
-            "errorLabels": [
-              "RetryableWriteError"
-            ],
             "errmsg": "Replication is being shut down"
           }
         }
@@ -1790,11 +1790,11 @@
           "failCommands": [
             "abortTransaction"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 189,
-            "errorLabels": [
-              "RetryableWriteError"
-            ],
             "errmsg": "Replication is being shut down"
           }
         }
@@ -1907,11 +1907,11 @@
           "failCommands": [
             "abortTransaction"
           ],
+          "errorLabels": [
+            "RetryableWriteError"
+          ],
           "writeConcernError": {
             "code": 91,
-            "errorLabels": [
-              "RetryableWriteError"
-            ],
             "errmsg": "Replication is being shut down"
           }
         }

diff --git a/test/spec/transactions/legacy/retryable-abort.yml b/test/spec/transactions/legacy/retryable-abort.yml
@@ -1021,9 +1021,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 11600
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1096,9 +1096,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 11602
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1171,9 +1171,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 189
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1246,9 +1246,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 91
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations: