PHPLIB-532: Fix result expectation assertions for retryable writes

Author: alcaeus

tests/SpecTests/Context.php

@@ -185,9 +185,6 @@ public static function fromRetryableWrites(stdClass $test, $databaseName, $colle
 
         $clientOptions = isset($test->clientOptions) ? (array) $test->clientOptions : [];
 
-        // TODO: Remove this once retryWrites=true by default (see: PHPC-1324)
-        $clientOptions['retryWrites'] = true;
-
         if (isset($test->outcome->collection->name)) {
             $o->outcomeCollectionName = $test->outcome->collection->name;
         }

tests/SpecTests/ResultExpectation.php

@@ -126,7 +126,7 @@ public static function fromRetryableReads(stdClass $operation, $defaultAssertion
 
     public static function fromRetryableWrites(stdClass $outcome, $defaultAssertionType)
     {
-        if (property_exists($outcome, 'result')) {
+        if (property_exists($outcome, 'result') && ! self::isErrorResult($outcome->result)) {
             $assertionType = $outcome->result === null ? self::ASSERT_NULL : $defaultAssertionType;
             $expectedValue = $outcome->result;
         } else {