Merge branch 'develop' into next
This commit is contained in:
commit
5ff51cb358
@ -249,7 +249,7 @@ TEST_F(CryConfigLoaderTest, AsksWhenLoadingNewerFilesystem_AnswerNo) {
|
||||
Load();
|
||||
EXPECT_TRUE(false); // expect throw
|
||||
} catch (const std::runtime_error &e) {
|
||||
EXPECT_THAT(e.what(), HasSubstr("Not trying to load file system"));
|
||||
EXPECT_THAT(e.what(), HasSubstr("It has to be migrated."));
|
||||
}
|
||||
}
|
||||
|
||||
@ -277,7 +277,7 @@ TEST_F(CryConfigLoaderTest, DontMigrateWhenAnsweredNo) {
|
||||
Load();
|
||||
EXPECT_TRUE(false); // expect throw
|
||||
} catch (const std::runtime_error &e) {
|
||||
EXPECT_THAT(e.what(), HasSubstr("Not migrating file system"));
|
||||
EXPECT_THAT(e.what(), HasSubstr("Please update your CryFS version."));
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user