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

Fix CI build

This commit is contained in:
Sebastian Messmer 2017-09-28 15:13:03 -07:00
parent 49719e3e66
commit 9cc3697e1b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/blockstore/interface/BlockStore2Test.cpp
View File

@ -16,6 +16,12 @@ using cpputils::DataFixture;
using cpputils::unique_ref;
using boost::optional;
namespace boost {
inline void PrintTo(const optional<cpputils::Data> &, ::std::ostream *os) {
*os << "optional<Data>";
}
}
using namespace blockstore;
class BlockStore2Mock: public BlockStore2 {

9
test/blockstore/testutils/BlockStoreTest.h
View File

@ -285,7 +285,7 @@ TYPED_TEST_P(BlockStoreTest, Resize_Smaller_ToZero_BlockIsStillUsable) {
block->resize(0);
this->TestBlockIsUsable(std::move(block), blockStore.get());
}
/*
TYPED_TEST_P(BlockStoreTest, TryCreateTwoBlocksWithSameBlockIdAndSameSize) {
auto blockStore = this->fixture.createBlockStore();
blockstore::BlockId blockId = blockstore::BlockId::FromString("1491BB4932A389EE14BC7090AC772972");
@ -295,7 +295,7 @@ TYPED_TEST_P(BlockStoreTest, TryCreateTwoBlocksWithSameBlockIdAndSameSize) {
EXPECT_NE(boost::none, block);
EXPECT_EQ(boost::none, block2);
}
/*
TYPED_TEST_P(BlockStoreTest, TryCreateTwoBlocksWithSameBlockIdAndDifferentSize) {
auto blockStore = this->fixture.createBlockStore();
blockstore::BlockId blockId = blockstore::BlockId::FromString("1491BB4932A389EE14BC7090AC772972");
@ -383,6 +383,7 @@ REGISTER_TYPED_TEST_CASE_P(BlockStoreTest,
ForEachBlock_twoblocks,
ForEachBlock_threeblocks,
ForEachBlock_doesntListRemovedBlocks_oneblock,
ForEachBlock_doesntListRemovedBlocks_twoblocks,
Resize_Larger_FromZero,
Resize_Larger_FromZero_BlockIsStillUsable,
Resize_Larger,
@ -390,10 +391,10 @@ REGISTER_TYPED_TEST_CASE_P(BlockStoreTest,
Resize_Smaller,
Resize_Smaller_BlockIsStillUsable,
Resize_Smaller_ToZero,
Resize_Smaller_ToZero_BlockIsStillUsable,
TryCreateTwoBlocksWithSameBlockIdAndSameSize
Resize_Smaller_ToZero_BlockIsStillUsable
//TODO Just disabled because gtest doesn't allow more template parameters. Fix and reenable!
// see https://github.com/google/googletest/issues/1267
//TryCreateTwoBlocksWithSameBlockIdAndSameSize,
//TryCreateTwoBlocksWithSameBlockIdAndDifferentSize,
//TryCreateTwoBlocksWithSameBlockIdAndFirstNullSize,
//TryCreateTwoBlocksWithSameBlockIdAndSecondNullSize,