Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f89351c
gitignore: add sourcetrail ignores.
graydon Mar 30, 2019
accfe51
test: add a for_all_versions helper that modifies a Config.
graydon Mar 30, 2019
2fc0d92
bucket: add new fine-grained operation counters for testing.
graydon Mar 30, 2019
fb4f949
config: add flag to inhibit fine-grained counters in some contexts.
graydon Mar 30, 2019
68ed59c
bucket: add support for INITENTRY/METAENTRY, bump protocol.
graydon Mar 30, 2019
3bea809
bucket: split bucket tests into 3 files (normal, list and manager)
graydon Mar 30, 2019
b042be5
bucket: add tests of merging with INIT & META in various versions.
graydon Mar 30, 2019
c9c9c9e
bucket: more thorough stop-start test of buckets.
graydon Mar 30, 2019
d05493f
history: check initentry-aware version can catch up from older history.
graydon Mar 30, 2019
7bb0db6
bucket: default protocol 0, adapt tests to avoid version time-travel.
graydon Mar 30, 2019
56b441a
herder: test 10->11 upgrade.
graydon Mar 30, 2019
0684f7e
bucketlist: correct comment to deal with range skew.
graydon Mar 30, 2019
cd1ad60
bucket: add comments with some more-precise bucket-event boundary num…
graydon Mar 30, 2019
e2a5bbb
clang reformat
graydon Apr 3, 2019
308dd28
bucket: scale default tests down a touch to not time out CI.
graydon Apr 3, 2019
0195502
Fixed tests that depend on order of merges in Bucket::fresh
jonjove Mar 27, 2019
d864df2
Simplify Bucket::fresh
jonjove Mar 27, 2019
6b5fa51
Clean-up usage of convertToBucketEntry
jonjove Apr 3, 2019
02b8111
bucket: reformat and fix upgrade test.
graydon Apr 3, 2019
233106a
bucket: fix test util that hangs on machines with >10 cores.
graydon Apr 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bucket: scale default tests down a touch to not time out CI.
  • Loading branch information
graydon committed Apr 4, 2019
commit 308dd285d16f96eb78ddb34f6a8e0d6792d3e17e
12 changes: 10 additions & 2 deletions src/bucket/test/BucketListTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ TEST_CASE("bucket tombstones expire at bottom level",
}

TEST_CASE("bucket tombstones mutually-annihilate init entries",
"[bucket][bucketlist][bl-initentry][!hide]")
"[bucket][bucketlist][bl-initentry]")
{
VirtualClock clock;
Config const& cfg = getTestConfig();
Expand All @@ -372,7 +372,7 @@ TEST_CASE("bucket tombstones mutually-annihilate init entries",
auto vers = getAppLedgerVersion(app);
autocheck::generator<bool> flip;
std::deque<LedgerEntry> entriesToModify;
for (uint32_t i = 1; i < 10000; ++i)
for (uint32_t i = 1; i < 512; ++i)
{
std::vector<LedgerEntry> initEntries =
LedgerTestUtils::generateValidLedgerEntries(8);
Expand Down Expand Up @@ -420,6 +420,14 @@ TEST_CASE("bucket tombstones mutually-annihilate init entries",
auto const& lev = bl.getLevel(k);
auto currSz = countEntries(lev.getCurr());
auto snapSz = countEntries(lev.getSnap());
if (cfg.LEDGER_PROTOCOL_VERSION >=
Bucket::FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY)
{
// init/dead pairs should mutually-annihilate pretty readily as
// they go, empirically this test peaks at buckets around 400
// entries.
REQUIRE((currSz + snapSz) < 500);
}
CLOG(INFO, "Bucket")
<< "Level " << k << " size: " << (currSz + snapSz);
}
Expand Down
18 changes: 17 additions & 1 deletion src/bucket/test/BucketManagerTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,23 @@ TEST_CASE("bucket persistence over app restart with initentry",
{Bucket::FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY - 1,
Bucket::FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY})
{
for (uint32_t level : {2, 3, 4})
for (uint32_t level : {2, 3})
{
StopAndRestartBucketMergesTest t(protocol, level);
t.run();
}
}
}

// Same as previous test, but runs a long time; too long to run in CI.
TEST_CASE("bucket persistence over app restart with initentry - extended",
"[bucket][bucketmanager][bp-initentry-ext][!hide]")
{
for (uint32_t protocol :
{Bucket::FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY - 1,
Bucket::FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY})
{
for (uint32_t level : {2, 3, 4, 5})
{
StopAndRestartBucketMergesTest t(protocol, level);
t.run();
Expand Down