diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp')
-rw-r--r-- | storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp index 8ce1ce4ea03..710da80972f 100644 --- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp @@ -1,11 +1,12 @@ -// 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 <vespa/storageapi/message/bucket.h> -#include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h> -#include <vespa/persistence/spi/test.h> +#include <tests/persistence/common/filestortestfixture.h> #include <tests/persistence/common/persistenceproviderwrapper.h> +#include <vespa/config/helper/configgetter.hpp> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/common/filestortestfixture.h> +#include <vespa/persistence/spi/test.h> +#include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h> +#include <vespa/storageapi/message/bucket.h> using storage::spi::test::makeSpiBucket; using namespace ::testing; @@ -36,10 +37,10 @@ struct BucketCheckerInjector : FileStorTestFixture::StorageLinkInjector _fixture(fixture) {} void inject(DummyStorageLink& link) const override { + using vespa::config::content::core::StorServerConfig; + auto cfg = config_from<StorServerConfig>(config::ConfigUri(_fixture._config->getConfigId())); link.push_back(std::make_unique<ModifiedBucketChecker>( - _node.getComponentRegister(), - _node.getPersistenceProvider(), - config::ConfigUri(_fixture._config->getConfigId()))); + _node.getComponentRegister(), _node.getPersistenceProvider(), *cfg)); } }; |