diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-14 23:07:22 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-15 04:59:11 +0000 |
| commit | 30d76ff5080f3f911d9119125202d7bad0a2a9da (patch) | |
| tree | 9123279b9637e8cbab0b116428892e8990215d48 /storage/src/tests/common | |
| parent | f07e7cde693a73d99d6d3d27dc3aa65e44d1958b (diff) | |
GC disk related code.
Diffstat (limited to 'storage/src/tests/common')
| -rw-r--r-- | storage/src/tests/common/metricstest.cpp | 3 | ||||
| -rw-r--r-- | storage/src/tests/common/teststorageapp.cpp | 3 | ||||
| -rw-r--r-- | storage/src/tests/common/teststorageapp.h | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp index 59d8fa4b2d3..c0ccb5bc771 100644 --- a/storage/src/tests/common/metricstest.cpp +++ b/storage/src/tests/common/metricstest.cpp @@ -71,8 +71,7 @@ void MetricsTest::SetUp() { _config = std::make_unique<vdstestlib::DirConfig>(getStandardConfig(true, "metricstest")); assert(system(("rm -rf " + getRootFolder(*_config)).c_str()) == 0); try { - _node = std::make_unique<TestServiceLayerApp>( - DiskCount(1), NodeIndex(0), _config->getConfigId()); + _node = std::make_unique<TestServiceLayerApp>(NodeIndex(0), _config->getConfigId()); _node->setupDummyPersistence(); _clock = &_node->getClock(); _clock->setAbsoluteTimeInSeconds(1000000); diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp index 992d6a54d91..1c69e87e38e 100644 --- a/storage/src/tests/common/teststorageapp.cpp +++ b/storage/src/tests/common/teststorageapp.cpp @@ -147,14 +147,13 @@ TestServiceLayerApp::TestServiceLayerApp(vespalib::stringref configId) _nodeStateUpdater.setReportedNodeState(ns); } -TestServiceLayerApp::TestServiceLayerApp(DiskCount dc, NodeIndex index, +TestServiceLayerApp::TestServiceLayerApp(NodeIndex index, vespalib::stringref configId) : TestStorageApp(std::make_unique<ServiceLayerComponentRegisterImpl>(true), // TODO remove B-tree flag once default lib::NodeType::STORAGE, index, configId), _compReg(dynamic_cast<ServiceLayerComponentRegisterImpl&>(TestStorageApp::getComponentRegister())), _persistenceProvider() { - assert(dc == 1u); _compReg.setDiskCount(1); lib::NodeState ns(*_nodeStateUpdater.getReportedNodeState()); ns.setDiskCount(1); diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h index f7edf5e0678..37c9e3c7ffe 100644 --- a/storage/src/tests/common/teststorageapp.h +++ b/storage/src/tests/common/teststorageapp.h @@ -112,9 +112,8 @@ class TestServiceLayerApp : public TestStorageApp PersistenceProviderUP _persistenceProvider; public: - TestServiceLayerApp(vespalib::stringref configId = ""); - TestServiceLayerApp(DiskCount diskCount, NodeIndex = NodeIndex(0xffff), - vespalib::stringref configId = ""); + TestServiceLayerApp(vespalib::stringref configId); + TestServiceLayerApp(NodeIndex = NodeIndex(0xffff), vespalib::stringref configId = ""); ~TestServiceLayerApp(); void setupDummyPersistence(); |