mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-10 18:05:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Enable unlock for all tests. (#1185)

Browse source
This commit is contained in:
Chaka 2023-05-06 20:38:12 +03:00 • committed by GitHub
parent db5d6a0ba7
commit 5df0d92c44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/dragonfly_test.cc
View file

@ -291,8 +291,6 @@ TEST_F(DflyEngineTest, LimitMemory) {
}
TEST_F(DflyEngineTest, FlushAll) {
DisableLockCheck();
auto fb0 = pp_->at(0)->LaunchFiber([&] { Run({"flushall"}); });
auto fb1 = pp_->at(1)->LaunchFiber([&] {

2
src/server/multi_test.cc
View file

@ -124,8 +124,6 @@ TEST_F(MultiTest, Multi) {
}
TEST_F(MultiTest, MultiGlobalCommands) {
DisableLockCheck();
ASSERT_THAT(Run({"set", "key", "val"}), "OK");
ASSERT_THAT(Run({"multi"}), "OK");

11
src/server/test_utils.cc
View file

@ -156,14 +156,13 @@ void BaseFamilyTest::SetUp() {
LOG(INFO) << "Starting " << test_info->name();
}
void BaseFamilyTest::DisableLockCheck() {
check_locks_ = false;
}
unsigned BaseFamilyTest::NumLocked() {
atomic_uint count = 0;
shard_set->RunBriefInParallel([&](EngineShard* shard) {
for (const auto& db : shard->db_slice().databases()) {
if (db == nullptr) {
continue;
}
count += db->trans_locks.size();
}
});
@ -171,9 +170,7 @@ unsigned BaseFamilyTest::NumLocked() {
}
void BaseFamilyTest::TearDown() {
if (check_locks_) {
CHECK_EQ(NumLocked(), 0U);
}
CHECK_EQ(NumLocked(), 0U);
service_->Shutdown();
service_.reset();

2
src/server/test_utils.h
View file

@ -90,13 +90,11 @@ class BaseFamilyTest : public ::testing::Test {
const facade::Connection::PubMessage::MessageData& GetPublishedMessage(std::string_view conn_id,
size_t index) const;
void DisableLockCheck();
static unsigned NumLocked();
std::unique_ptr<util::ProactorPool> pp_;
std::unique_ptr<Service> service_;
unsigned num_threads_ = 3;
bool check_locks_ = true;
absl::flat_hash_map<std::string, std::unique_ptr<TestConnWrapper>> connections_;
Mutex mu_;