Merge pull request #16968 from liewegas/wip-store-test-expect-death

ceph_test_objectstore: drop expect regex
This commit is contained in:
Sage Weil 2017-08-11 08:45:02 -05:00 committed by GitHub
commit 410a23bcdb

View File

@ -2849,7 +2849,7 @@ TEST_P(StoreTest, SimpleCloneTest) {
t.remove_collection(cid);
cerr << "Invalid rm coll" << std::endl;
PrCtl unset_dumpable;
EXPECT_DEATH(apply_transaction(store, &osr, std::move(t)), ".*Directory not empty.*");
EXPECT_DEATH(apply_transaction(store, &osr, std::move(t)), "");
}
{
ObjectStore::Transaction t;
@ -2871,7 +2871,7 @@ TEST_P(StoreTest, SimpleCloneTest) {
t.remove(cid, hoid2);
t.remove_collection(cid);
PrCtl unset_dumpable;
EXPECT_DEATH(apply_transaction(store, &osr, std::move(t)), ".*Directory not empty.*");
EXPECT_DEATH(apply_transaction(store, &osr, std::move(t)), "");
}
{
ObjectStore::Transaction t;