CSHARP-4255: Fix merge conflict. (#992)

DmitryLukyanov · web-flow · commit def8eab7d4ef · 2022-12-15T00:29:44.000+04:00
diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs
@@ -155,7 +155,7 @@ void RunTestCase(int testCase)
             }
         }
 
-        [SkippableTheory]
+        [Theory]
         [ParameterAttributeData]
         public void BsonSizeLimitAndBatchSizeSplittingTest(
             [Values(false, true)] bool async)
@@ -1946,7 +1946,7 @@ HttpClientWrapperWithModifiedRequest CreateHttpClientWrapperWithModifiedRequest(
             }
         }
 
-        [SkippableTheory]
+        [Theory]
         [ParameterAttributeData]
         public void RewrapTest(
             [Values("local", "aws", "azure", "gcp", "kmip")] string srcProvider,

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ void RunTestCase(int testCase)`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`- [SkippableTheory]`
	`158`	`+ [Theory]`
`159`	`159`	`[ParameterAttributeData]`
`160`	`160`	`public void BsonSizeLimitAndBatchSizeSplittingTest(`
`161`	`161`	`[Values(false, true)] bool async)`
`@@ -1946,7 +1946,7 @@ HttpClientWrapperWithModifiedRequest CreateHttpClientWrapperWithModifiedRequest(`
`1946`	`1946`	`}`
`1947`	`1947`	`}`
`1948`	`1948`
`1949`		`- [SkippableTheory]`
	`1949`	`+ [Theory]`
`1950`	`1950`	`[ParameterAttributeData]`
`1951`	`1951`	`public void RewrapTest(`
`1952`	`1952`	`[Values("local", "aws", "azure", "gcp", "kmip")] string srcProvider,`