aboutsummaryrefslogtreecommitdiffstats
path: root/storageserver/src/tests/storageservertest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'storageserver/src/tests/storageservertest.cpp')
-rw-r--r--storageserver/src/tests/storageservertest.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp
index d2cfaac03c2..b18b241acaa 100644
--- a/storageserver/src/tests/storageservertest.cpp
+++ b/storageserver/src/tests/storageservertest.cpp
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <tests/testhelper.h>
#include <vespa/storage/storageserver/distributornode.h>
@@ -43,7 +43,7 @@ struct Node {
struct Distributor : public Node {
DistributorProcess _process;
- Distributor(vdstestlib::DirConfig& config);
+ explicit Distributor(vdstestlib::DirConfig& config);
~Distributor() override;
StorageNode& getNode() override { return _process.getNode(); }
@@ -54,7 +54,7 @@ struct Storage : public Node {
DummyServiceLayerProcess _process;
StorageComponent::UP _component;
- Storage(vdstestlib::DirConfig& config);
+ explicit Storage(vdstestlib::DirConfig& config);
~Storage() override;
StorageNode& getNode() override { return _process.getNode(); }
@@ -75,8 +75,7 @@ Storage::Storage(vdstestlib::DirConfig& config)
{
_process.setupConfig(60000ms);
_process.createNode();
- _component = std::make_unique<StorageComponent>(
- getContext().getComponentRegister(), "test");
+ _component = std::make_unique<StorageComponent>(getContext().getComponentRegister(), "test");
}
Storage::~Storage() = default;
@@ -93,7 +92,6 @@ StorageServerTest::SetUp()
storConfig = std::make_unique<vdstestlib::DirConfig>(getStandardConfig(true));
addSlobrokConfig(*distConfig, *slobrok);
addSlobrokConfig(*storConfig, *slobrok);
- storConfig->getConfig("stor-filestor").set("fail_disk_after_error_count", "1");
systemResult = system("mkdir -p vdsroot/disks/d0");
systemResult = system("mkdir -p vdsroot.distributor");
}
@@ -101,6 +99,7 @@ StorageServerTest::SetUp()
void
StorageServerTest::TearDown()
{
+ // TODO wipe temp dirs
storConfig.reset(nullptr);
distConfig.reset(nullptr);
slobrok.reset(nullptr);