PYTHON-1740 - Fix up transaction tests

behackett · behackett · commit 9ca480054302 · 2019-03-13T16:10:03.000-07:00
diff --git a/test/test_transactions.py b/test/test_transactions.py
@@ -700,7 +700,8 @@ def run_scenario(self):
 
         database_name = scenario_def['database_name']
         collection_name = scenario_def['collection_name']
-        write_concern_db = client.get_database(
+        # Don't use the test client to load data.
+        write_concern_db = client_context.client.get_database(
             database_name, write_concern=WriteConcern(w='majority'))
         write_concern_coll = write_concern_db[collection_name]
         write_concern_coll.drop()
diff --git a/test/transactions/causal-consistency.json b/test/transactions/causal-consistency.json
@@ -15,7 +15,7 @@
     {
       "description": "causal consistency",
       "clientOptions": {
-          "retryWrites": false
+        "retryWrites": false
       },
       "operations": [
         {
@@ -165,7 +165,7 @@
     {
       "description": "causal consistency disabled",
       "clientOptions": {
-          "retryWrites": false
+        "retryWrites": false
       },
       "sessionOptions": {
         "session0": {
diff --git a/test/transactions/commit.json b/test/transactions/commit.json
@@ -673,7 +673,7 @@
     {
       "description": "reset session state commit",
       "clientOptions": {
-          "retryWrites": false
+        "retryWrites": false
       },
       "operations": [
         {
@@ -795,7 +795,7 @@
     {
       "description": "reset session state abort",
       "clientOptions": {
-          "retryWrites": false
+        "retryWrites": false
       },
       "operations": [
         {
diff --git a/test/transactions/delete.json b/test/transactions/delete.json
@@ -25,9 +25,6 @@
   "tests": [
     {
       "description": "delete",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -187,9 +184,6 @@
     },
     {
       "description": "collection writeConcern ignored for delete",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
diff --git a/test/transactions/findOneAndDelete.json b/test/transactions/findOneAndDelete.json
@@ -19,9 +19,6 @@
   "tests": [
     {
       "description": "findOneAndDelete",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -132,9 +129,6 @@
     },
     {
       "description": "collection writeConcern ignored for findOneAndDelete",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
diff --git a/test/transactions/findOneAndReplace.json b/test/transactions/findOneAndReplace.json
@@ -19,9 +19,6 @@
   "tests": [
     {
       "description": "findOneAndReplace",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -159,9 +156,6 @@
     },
     {
       "description": "collection writeConcern ignored for findOneAndReplace",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
diff --git a/test/transactions/findOneAndUpdate.json b/test/transactions/findOneAndUpdate.json
@@ -19,9 +19,6 @@
   "tests": [
     {
       "description": "findOneAndUpdate",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -313,9 +310,6 @@
     },
     {
       "description": "collection writeConcern ignored for findOneAndUpdate",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
diff --git a/test/transactions/insert.json b/test/transactions/insert.json
@@ -430,7 +430,7 @@
     {
       "description": "collection writeConcern without transaction",
       "clientOptions": {
-          "retryWrites": false
+        "retryWrites": false
       },
       "operations": [
         {
diff --git a/test/transactions/mongos-pin-auto.json b/test/transactions/mongos-pin-auto.json
@@ -15,9 +15,6 @@
   "tests": [
     {
       "description": "remain pinned after non-transient Interrupted error on insertOne",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "useMultipleMongoses": true,
       "operations": [
         {
@@ -168,9 +165,6 @@
     },
     {
       "description": "unpin after transient error within a transaction",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "useMultipleMongoses": true,
       "operations": [
         {
diff --git a/test/transactions/pin-mongos.json b/test/transactions/pin-mongos.json
@@ -925,9 +925,6 @@
     },
     {
       "description": "unpin after transient error within a transaction",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "useMultipleMongoses": true,
       "operations": [
         {
@@ -1071,7 +1068,6 @@
       "description": "unpin after transient error within a transaction and commit",
       "useMultipleMongoses": true,
       "clientOptions": {
-        "retryWrites": false,
         "heartbeatFrequencyMS": 5000
       },
       "operations": [
diff --git a/test/transactions/read-concern.json b/test/transactions/read-concern.json
@@ -22,9 +22,6 @@
   "tests": [
     {
       "description": "only first countDocuments includes readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -188,9 +185,6 @@
     },
     {
       "description": "only first find includes readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -378,9 +372,6 @@
     },
     {
       "description": "only first aggregate includes readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -600,9 +591,6 @@
     },
     {
       "description": "only first distinct includes readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -736,9 +724,6 @@
     },
     {
       "description": "only first runCommand includes readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -854,9 +839,6 @@
     },
     {
       "description": "countDocuments ignores collection readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -1011,9 +993,6 @@
     },
     {
       "description": "find ignores collection readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -1192,9 +1171,6 @@
     },
     {
       "description": "aggregate ignores collection readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -1405,9 +1381,6 @@
     },
     {
       "description": "distinct ignores collection readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -1532,9 +1505,6 @@
     },
     {
       "description": "runCommand ignores database readConcern",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
diff --git a/test/transactions/reads.json b/test/transactions/reads.json
@@ -89,9 +89,6 @@
     },
     {
       "description": "count",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -178,9 +175,6 @@
     },
     {
       "description": "find",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -345,9 +339,6 @@
     },
     {
       "description": "aggregate",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -544,9 +535,6 @@
     },
     {
       "description": "distinct",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
diff --git a/test/transactions/update.json b/test/transactions/update.json
@@ -19,9 +19,6 @@
   "tests": [
     {
       "description": "update",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",
@@ -230,9 +227,6 @@
     },
     {
       "description": "collections writeConcern ignored for update",
-      "clientOptions": {
-          "retryWrites": false
-      },
       "operations": [
         {
           "name": "startTransaction",

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`{`
`16`	`16`	`"description": "causal consistency",`
`17`	`17`	`"clientOptions": {`
`18`		`- "retryWrites": false`
	`18`	`+ "retryWrites": false`
`19`	`19`	`},`
`20`	`20`	`"operations": [`
`21`	`21`	`{`
`@@ -165,7 +165,7 @@`
`165`	`165`	`{`
`166`	`166`	`"description": "causal consistency disabled",`
`167`	`167`	`"clientOptions": {`
`168`		`- "retryWrites": false`
	`168`	`+ "retryWrites": false`
`169`	`169`	`},`
`170`	`170`	`"sessionOptions": {`
`171`	`171`	`"session0": {`
Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@`
`673`	`673`	`{`
`674`	`674`	`"description": "reset session state commit",`
`675`	`675`	`"clientOptions": {`
`676`		`- "retryWrites": false`
	`676`	`+ "retryWrites": false`
`677`	`677`	`},`
`678`	`678`	`"operations": [`
`679`	`679`	`{`
`@@ -795,7 +795,7 @@`
`795`	`795`	`{`
`796`	`796`	`"description": "reset session state abort",`
`797`	`797`	`"clientOptions": {`
`798`		`- "retryWrites": false`
	`798`	`+ "retryWrites": false`
`799`	`799`	`},`
`800`	`800`	`"operations": [`
`801`	`801`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@`
`25`	`25`	`"tests": [`
`26`	`26`	`{`
`27`	`27`	`"description": "delete",`
`28`		`- "clientOptions": {`
`29`		`- "retryWrites": false`
`30`		`- },`
`31`	`28`	`"operations": [`
`32`	`29`	`{`
`33`	`30`	`"name": "startTransaction",`
`@@ -187,9 +184,6 @@`
`187`	`184`	`},`
`188`	`185`	`{`
`189`	`186`	`"description": "collection writeConcern ignored for delete",`
`190`		`- "clientOptions": {`
`191`		`- "retryWrites": false`
`192`		`- },`
`193`	`187`	`"operations": [`
`194`	`188`	`{`
`195`	`189`	`"name": "startTransaction",`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@`
`19`	`19`	`"tests": [`
`20`	`20`	`{`
`21`	`21`	`"description": "findOneAndDelete",`
`22`		`- "clientOptions": {`
`23`		`- "retryWrites": false`
`24`		`- },`
`25`	`22`	`"operations": [`
`26`	`23`	`{`
`27`	`24`	`"name": "startTransaction",`
`@@ -132,9 +129,6 @@`
`132`	`129`	`},`
`133`	`130`	`{`
`134`	`131`	`"description": "collection writeConcern ignored for findOneAndDelete",`
`135`		`- "clientOptions": {`
`136`		`- "retryWrites": false`
`137`		`- },`
`138`	`132`	`"operations": [`
`139`	`133`	`{`
`140`	`134`	`"name": "startTransaction",`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@`
`430`	`430`	`{`
`431`	`431`	`"description": "collection writeConcern without transaction",`
`432`	`432`	`"clientOptions": {`
`433`		`- "retryWrites": false`
	`433`	`+ "retryWrites": false`
`434`	`434`	`},`
`435`	`435`	`"operations": [`
`436`	`436`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,6 @@`
`15`	`15`	`"tests": [`
`16`	`16`	`{`
`17`	`17`	`"description": "remain pinned after non-transient Interrupted error on insertOne",`
`18`		`- "clientOptions": {`
`19`		`- "retryWrites": false`
`20`		`- },`
`21`	`18`	`"useMultipleMongoses": true,`
`22`	`19`	`"operations": [`
`23`	`20`	`{`
`@@ -168,9 +165,6 @@`
`168`	`165`	`},`
`169`	`166`	`{`
`170`	`167`	`"description": "unpin after transient error within a transaction",`
`171`		`- "clientOptions": {`
`172`		`- "retryWrites": false`
`173`		`- },`
`174`	`168`	`"useMultipleMongoses": true,`
`175`	`169`	`"operations": [`
`176`	`170`	`{`