SERVER-18199 WiredTiger changes for 3.1.2.

Just scripts for now: the real merge will follow.

2 files changed, 1 insertions, 10 deletions

diff --git a/buildscripts/update-vendor-wiredtiger b/buildscripts/update-vendor-wiredtiger
index e4fbf9ce64e..5a5c2497e7b 100755
--- a/buildscripts/update-vendor-wiredtiger
+++ b/buildscripts/update-vendor-wiredtiger
@@ -6,7 +6,7 @@
 
 set -o errexit
 
-REMOTEBRANCH="mongodb-3.0"
+REMOTEBRANCH="mongodb-3.2"
 LOCALBRANCH=$(git symbolic-ref HEAD)
 
 # Ensure working directory is TOPLEVEL/src/third_party
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util_test.cpp
index e35ecd35f2f..75472f6fcc5 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util_test.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util_test.cpp
@@ -170,15 +170,6 @@ namespace mongo {
         ASSERT_EQUALS(ErrorCodes::FailedToParse, result.getStatus().code());
     }
 
-    TEST_F(WiredTigerUtilMetadataTest, GetApplicationMetadataInvalidMetadata) {
-        const char* config = "app_metadata=(abc=def=ghi)";
-        createSession(config);
-        StatusWith<BSONObj> result =
-            WiredTigerUtil::getApplicationMetadata(getOperationContext(), getURI());
-        ASSERT_NOT_OK(result.getStatus());
-        ASSERT_EQUALS(ErrorCodes::BadValue, result.getStatus().code());
-    }
-
     TEST_F(WiredTigerUtilMetadataTest, GetApplicationMetadataDuplicateKeys) {
         const char* config = "app_metadata=(abc=123,abc=456)";
         createSession(config);