hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'develop' into next

This commit is contained in:
Sebastian Messmer 2016-09-25 03:01:42 +02:00
parent e009040264 8ae2dee7fc
commit 5ff51cb358
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/cryfs/config/CryConfigLoaderTest.cpp
View File

@ -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."));
}
}