From 09354db1434859a31a3c81abebcc4018d42f2715 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Tue, 18 Jul 2017 15:38:30 -0700
Subject: Merge from Google internal for 3.4 release

---
 conformance/conformance_test.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'conformance/conformance_test.cc')

diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index 0dd7787c..3f73595d 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -1516,9 +1516,10 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
       "BytesField", REQUIRED,
       R"({"optionalBytes": "AQI="})",
       R"(optional_bytes: "\x01\x02")");
-  ExpectParseFailureForJson(
-      "BytesFieldInvalidBase64Characters", REQUIRED,
-      R"({"optionalBytes": "-_=="})");
+  RunValidJsonTest(
+      "BytesFieldBase64Url", RECOMMENDED,
+      R"({"optionalBytes": "-_"})",
+      R"(optional_bytes: "\xfb")");
 
   // Message fields.
   RunValidJsonTest(
-- 
cgit v1.2.3