From 17372bffcf148c4dcba75ccc6fed28f3c1844215 Mon Sep 17 00:00:00 2001 From: Adam Morrison Date: Mon, 11 Dec 2017 18:20:30 -0600 Subject: [PATCH 1/2] Hopefully it works now --- .ci/test/main.sh | 2 +- test/integration/ReadWriteTest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/test/main.sh b/.ci/test/main.sh index 2d81f09f..6e2f31f8 100755 --- a/.ci/test/main.sh +++ b/.ci/test/main.sh @@ -19,7 +19,7 @@ cd build/test run_test ./ErasureCodeTest # TODO(LINKIWI): investigate failure root cause -# run_test ./ReadWriteTest +run_test ./ReadWriteTest run_test ./DeleteTest run_test "./NameNodeTest --gtest_filter=-*Performance*" run_test ./NativeFsTest diff --git a/test/integration/ReadWriteTest.cc b/test/integration/ReadWriteTest.cc index 8d8a807d..2fe53f3a 100644 --- a/test/integration/ReadWriteTest.cc +++ b/test/integration/ReadWriteTest.cc @@ -64,7 +64,7 @@ TEST(ReadWriteTest, testReadWrite) { // Check that its contents match. ASSERT_EQ(0, system("diff expected_testfile1234 actual_testfile1234 > " - "dev/null")); + "/dev/null")); system("hdfs dfs -fs hdfs://localhost:5351 -rm " "/f"); } From 89bad8a23b3fcaaba644aee534f79c94797cdebc Mon Sep 17 00:00:00 2001 From: Adam Morrison Date: Mon, 11 Dec 2017 18:38:38 -0600 Subject: [PATCH 2/2] Added sleep before dif, test is much less flaky --- test/integration/ReadWriteTest.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/ReadWriteTest.cc b/test/integration/ReadWriteTest.cc index 2fe53f3a..50a274fe 100644 --- a/test/integration/ReadWriteTest.cc +++ b/test/integration/ReadWriteTest.cc @@ -88,6 +88,7 @@ TEST(ReadWriteTest, testConcurrentRead) { "-cat /f > temp" + std::to_string(i)).c_str()); // Check that its contents match. + sleep(10); ASSERT_EQ(0, system(("diff expected_testfile1234 temp" + std::to_string(i) + " > /dev/null").c_str()));