You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2018/07/25 03:24:23 UTC

[07/10] mesos git commit: Fixed libprocess tests against rapidjson.

Fixed libprocess tests against rapidjson.

The libprocess tests were checking the serialized format of metrics,
which previously escaped forward slashes. However, this is not what
rapidjson does and it's also valid json according to ECMA-404.

Review: https://reviews.apache.org/r/67990


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/30840e2a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/30840e2a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/30840e2a

Branch: refs/heads/master
Commit: 30840e2a612e068197bb1867dd2483045f43516f
Parents: 9742051
Author: Benjamin Mahler <bm...@apache.org>
Authored: Thu Jul 19 19:11:20 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Jul 24 18:33:24 2018 -0700

----------------------------------------------------------------------
 3rdparty/libprocess/src/tests/metrics_tests.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/30840e2a/3rdparty/libprocess/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/metrics_tests.cpp b/3rdparty/libprocess/src/tests/metrics_tests.cpp
index 8590bdb..8812756 100644
--- a/3rdparty/libprocess/src/tests/metrics_tests.cpp
+++ b/3rdparty/libprocess/src/tests/metrics_tests.cpp
@@ -344,20 +344,20 @@ TEST_F(MetricsTest, SnapshotAlphabetical)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
   // Ensure the response is ordered alphabetically.
-  EXPECT_LT(response->body.find("test\\/e"),
-            response->body.find("test\\/f"));
+  EXPECT_LT(response->body.find("test/e"),
+            response->body.find("test/f"));
 
-  EXPECT_LT(response->body.find("test\\/d"),
-            response->body.find("test\\/e"));
+  EXPECT_LT(response->body.find("test/d"),
+            response->body.find("test/e"));
 
-  EXPECT_LT(response->body.find("test\\/c"),
-            response->body.find("test\\/d"));
+  EXPECT_LT(response->body.find("test/c"),
+            response->body.find("test/d"));
 
-  EXPECT_LT(response->body.find("test\\/b"),
-            response->body.find("test\\/c"));
+  EXPECT_LT(response->body.find("test/b"),
+            response->body.find("test/c"));
 
-  EXPECT_LT(response->body.find("test\\/a"),
-            response->body.find("test\\/b"));
+  EXPECT_LT(response->body.find("test/a"),
+            response->body.find("test/b"));
 
   foreach (const Counter& counter, counters) {
     AWAIT_READY(metrics::remove(counter));