diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-18 10:07:34 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-19 14:15:48 +0000 |
commit | b7b7a61213ffbe9dc07f5a48d0aa3fb8c45a39e1 (patch) | |
tree | 936079f84eb8bcdf30371d309d1e1839c645f903 /storage/src/tests/storageserver | |
parent | d7ea80c0383daf1e3a84b625496aa1a394bc0179 (diff) |
decouple slime from config.
Diffstat (limited to 'storage/src/tests/storageserver')
-rw-r--r-- | storage/src/tests/storageserver/statemanagertest.cpp | 6 | ||||
-rw-r--r-- | storage/src/tests/storageserver/statereportertest.cpp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp index 68a35ac37d9..dcbd20b2a75 100644 --- a/storage/src/tests/storageserver/statemanagertest.cpp +++ b/storage/src/tests/storageserver/statemanagertest.cpp @@ -1,11 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <boost/pointer_cast.hpp> #include <cppunit/extensions/HelperMacros.h> -#include <iostream> #include <vespa/metrics/metricmanager.h> -#include <string> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/state.h> #include <vespa/vdslib/state/nodestate.h> @@ -15,7 +12,8 @@ #include <tests/common/teststorageapp.h> #include <tests/common/testhelper.h> #include <tests/common/dummystoragelink.h> -#include <vespa/vespalib/data/slime/type.h> +#include <vespa/vespalib/data/slime/slime.h> +#include <iostream> using storage::lib::NodeState; using storage::lib::NodeType; diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp index 3f3825f344d..1b6cd1d8a08 100644 --- a/storage/src/tests/storageserver/statereportertest.cpp +++ b/storage/src/tests/storageserver/statereportertest.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <cppunit/extensions/HelperMacros.h> -#include <vespa/log/log.h> #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> #include <vespa/storage/persistence/filestorage/filestormanager.h> #include <vespa/storage/storageserver/applicationgenerationfetcher.h> @@ -11,7 +9,9 @@ #include <tests/common/teststorageapp.h> #include <tests/common/testhelper.h> #include <tests/common/dummystoragelink.h> +#include <vespa/vespalib/data/slime/slime.h> +#include <vespa/log/log.h> LOG_SETUP(".test.statereporter"); namespace storage { |