Fix tests for MongoDB 3.0.0

Author: bjori

tests/replicaset/writeconcern-error.phpt

@@ -16,7 +16,7 @@ $w = new MongoDB\Driver\WriteConcern(30, 100);
 try {
     $retval = $manager->executeBulkWrite(NS, $bulk, $w);
 } catch(MongoDB\Driver\BulkWriteException $e) {
-    printWriteResult($e->getWriteResult());
+    printWriteResult($e->getWriteResult(), false);
 }
 ?>
 ===DONE===
@@ -28,21 +28,5 @@ matchedCount: 0
 modifiedCount: 0
 upsertedCount: 0
 deletedCount: 0
-object(MongoDB\Driver\WriteConcernError)#%d (%d) {
-  ["message"]=>
-  string(33) "waiting for replication timed out"
-  ["code"]=>
-  int(64)
-  ["info"]=>
-  array(1) {
-    ["wtimeout"]=>
-    bool(true)
-  }
-}
-writeConcernError.message: waiting for replication timed out
-writeConcernError.code: 64
-writeConcernError.info: array(1) {
-  ["wtimeout"]=>
-  bool(true)
-}
+writeConcernError: %s (%d)
 ===DONE===

tests/replicaset/writeconcernerror-0001.phpt

@@ -18,11 +18,11 @@ $bulk->delete(array("my" => "value", "foo" => "bar"), array("limit" => 1));
 
 $bulk->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), array("limit" => 1, "upsert" => 0));
 
-$w = new MongoDB\Driver\WriteConcern(30, 100);
+$w = new MongoDB\Driver\WriteConcern(30);
 try {
     $retval = $manager->executeBulkWrite(NS, $bulk, $w);
 } catch(MongoDB\Driver\BulkWriteException $e) {
-    printWriteResult($e->getWriteResult());
+    printWriteResult($e->getWriteResult(), false);
 }
 ?>
 ===DONE===
@@ -34,21 +34,5 @@ matchedCount: 1
 modifiedCount: 1
 upsertedCount: 0
 deletedCount: 1
-object(MongoDB\Driver\WriteConcernError)#%d (%d) {
-  ["message"]=>
-  string(33) "waiting for replication timed out"
-  ["code"]=>
-  int(64)
-  ["info"]=>
-  array(1) {
-    ["wtimeout"]=>
-    bool(true)
-  }
-}
-writeConcernError.message: waiting for replication timed out
-writeConcernError.code: 64
-writeConcernError.info: array(1) {
-  ["wtimeout"]=>
-  bool(true)
-}
+writeConcernError: %s (%d)
 ===DONE===

tests/utils/tools.php

@@ -112,7 +112,7 @@ function printServer(MongoDB\Driver\Server $server)
     printf("server: %s:%d\n", $server->getHost(), $server->getPort());
 }
 
-function printWriteResult(MongoDB\Driver\WriteResult $result)
+function printWriteResult(MongoDB\Driver\WriteResult $result, $details = true)
 {
     printServer($result->getServer());
 
@@ -128,16 +128,21 @@ function printWriteResult(MongoDB\Driver\WriteResult $result)
     }
 
     $writeConcernError = $result->getWriteConcernError();
-    printWriteConcernError($writeConcernError ? $writeConcernError : null);
+    printWriteConcernError($writeConcernError ? $writeConcernError : null, $details);
 
     foreach ($result->getWriteErrors() as $writeError) {
         printWriteError($writeError);
     }
 }
 
-function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null)
+function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null, $details)
 {
     if ($error) {
+        /* This stuff is generated by the server, no need for us to test it */
+        if (!$details) {
+            printf("writeConcernError: %s (%d)\n", $error->getMessage(), $error->getCode());
+            return;
+        }
         var_dump($error);
         printf("writeConcernError.message: %s\n", $error->getMessage());
         printf("writeConcernError.code: %d\n", $error->getCode());