backport fix for flaky testExportColumnsWithMetadata from 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/341b3fbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/341b3fbf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/341b3fbf Branch: refs/heads/trunk Commit: 341b3fbfb444bc0af81700cdc5a30d5bafea04a1 Parents: 9358e58 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jun 27 11:13:48 2016 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jun 27 11:13:48 2016 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/tools/SSTableExportTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/341b3fbf/test/unit/org/apache/cassandra/tools/SSTableExportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java index c918d6a..16f4bda 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -296,10 +296,9 @@ public class SSTableExportTest extends SchemaLoader JSONObject serializedDeletionInfo = (JSONObject) meta.get("deletionInfo"); assertNotNull("expecing deletionInfo to be present", serializedDeletionInfo); - assertEquals( - "unexpected serialization format for topLevelDeletion", - "{\"markedForDeleteAt\":0,\"localDeletionTime\":0}", - serializedDeletionInfo.toJSONString()); + assertEquals("unexpected serialization format for topLevelDeletion", + JSONValue.parse("{\"markedForDeleteAt\":0,\"localDeletionTime\":0}"), + serializedDeletionInfo); // check the colums are what we put in JSONArray cols = (JSONArray) row.get("cells");
