Rebase on master

vesoft-inc · Jun 11, 2019 · c6c4679 · c6c4679
1 parent d5dfd55
commit c6c4679
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/src/kvstore/raftex/test/LearnerTest.cpp b/src/kvstore/raftex/test/LearnerTest.cpp
@@ -46,7 +46,7 @@ TEST(LearnerTest, SimpleTest) {
         msgs.emplace_back(
             folly::stringPrintf("Test Log Message %03d", i));
         auto fut = leader->appendAsync(0, msgs.back());
-        ASSERT_EQ(RaftPart::AppendLogResult::SUCCEEDED,
+        ASSERT_EQ(AppendLogResult::SUCCEEDED,
                   std::move(fut).get());
     }
     LOG(INFO) << "<===== Finish appending logs";
@@ -80,7 +80,7 @@ TEST(LearnerTest, SimpleTest) {
         msgs.emplace_back(
             folly::stringPrintf("Test Log Message %03d", i));
         auto fut = leader->appendAsync(0, msgs.back());
-        ASSERT_EQ(RaftPart::AppendLogResult::SUCCEEDED,
+        ASSERT_EQ(AppendLogResult::SUCCEEDED,
                   std::move(fut).get());
     }
     LOG(INFO) << "<===== Finish appending logs";

diff --git a/src/kvstore/test/NebulaStoreTest.cpp b/src/kvstore/test/NebulaStoreTest.cpp
@@ -97,6 +97,7 @@ TEST(NebulaStoreTest, SimpleTest) {
         EXPECT_EQ(ResultCode::SUCCEEDED, code);
     });
 
+    sleep(1);
     int32_t start = 0;
     int32_t end = 100;
     std::string s(reinterpret_cast<const char*>(&start), sizeof(int32_t));

diff --git a/src/meta/test/TestUtils.h b/src/meta/test/TestUtils.h
@@ -117,6 +117,7 @@ class TestUtils {
                           [&] (kvstore::ResultCode code) {
                               ret = (code == kvstore::ResultCode::SUCCEEDED);
                           });
+        usleep(10000);
         return ret;
     }
 
@@ -143,6 +144,7 @@ class TestUtils {
                           [] (kvstore::ResultCode code) {
                                 ASSERT_EQ(kvstore::ResultCode::SUCCEEDED, code);
                           });
+        usleep(10000);
     }
 
     static void mockEdge(kvstore::KVStore* kv, int32_t edgeNum, SchemaVer version = 0) {
@@ -168,6 +170,7 @@ class TestUtils {
         kv->asyncMultiPut(0, 0, std::move(edges), [] (kvstore::ResultCode code) {
             ASSERT_EQ(kvstore::ResultCode::SUCCEEDED, code);
         });
+        usleep(10000);
     }
 
     static std::unique_ptr<test::ServerContext> mockMetaServer(uint16_t port,

diff --git a/src/storage/test/QueryBoundTest.cpp b/src/storage/test/QueryBoundTest.cpp
@@ -70,6 +70,7 @@ void mockData(kvstore::KVStore* kv) {
                 EXPECT_EQ(code, kvstore::ResultCode::SUCCEEDED);
             });
     }
+    sleep(1);
 }
 
 

diff --git a/src/storage/test/QueryEdgePropsTest.cpp b/src/storage/test/QueryEdgePropsTest.cpp
@@ -42,6 +42,7 @@ void mockData(kvstore::KVStore* kv) {
                 EXPECT_EQ(code, kvstore::ResultCode::SUCCEEDED);
             });
     }
+    sleep(1);
 }
 
 

diff --git a/src/storage/test/QueryStatsTest.cpp b/src/storage/test/QueryStatsTest.cpp
@@ -52,6 +52,7 @@ void mockData(kvstore::KVStore* kv) {
             EXPECT_EQ(code, kvstore::ResultCode::SUCCEEDED);
         });
     }
+    sleep(1);
 }
 
 

diff --git a/src/storage/test/QueryVertexPropsTest.cpp b/src/storage/test/QueryVertexPropsTest.cpp
@@ -50,6 +50,7 @@ TEST(QueryVertexPropsTest, SimpleTest) {
             });
     }
 
+    sleep(1);
     LOG(INFO) << "Build VertexPropsRequest...";
     cpp2::VertexPropRequest req;
     req.set_space_id(0);
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,7 @@ void mockData(kvstore::KVStore* kv) { @@
                     EXPECT_EQ(code, kvstore::ResultCode::SUCCEEDED);
                 });
         }
+        sleep(1);
     }
@@ Expand Down @@