diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2017-10-23 20:31:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 20:31:31 +0200 |
| commit | f777a0c3323d2fad706addb5426e1889f5332e0d (patch) | |
| tree | 7532bba6326061e0294acb468cab96e42ee52e3c /storageapi/src/tests/mbusprot/storageprotocoltest.cpp | |
| parent | 0d7ce451d2d4cda2ee6938573d130bd3ccff092b (diff) | |
Revert "Use existing bucket space instead of placeholder value"
Diffstat (limited to 'storageapi/src/tests/mbusprot/storageprotocoltest.cpp')
| -rw-r--r-- | storageapi/src/tests/mbusprot/storageprotocoltest.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp index cb0cf756586..bfd657c2f05 100644 --- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp +++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp @@ -16,7 +16,6 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/update/fieldpathupdates.h> #include <vespa/document/test/make_document_bucket.h> -#include <vespa/document/test/make_bucket_space.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/vespalib/util/growablebytebuffer.h> #include <vespa/vespalib/objects/nbostream.h> @@ -31,7 +30,6 @@ using document::DocumentId; using document::DocumentType; using document::DocumentTypeRepo; using document::test::makeDocumentBucket; -using document::test::makeBucketSpace; using storage::lib::ClusterState; using vespalib::string; @@ -391,7 +389,7 @@ StorageProtocolTest::testRequestBucketInfo51() std::vector<document::BucketId> ids; ids.push_back(document::BucketId(3)); ids.push_back(document::BucketId(7)); - RequestBucketInfoCommand::SP cmd(new RequestBucketInfoCommand(makeBucketSpace(), ids)); + RequestBucketInfoCommand::SP cmd(new RequestBucketInfoCommand(ids)); RequestBucketInfoCommand::SP cmd2(copyCommand(cmd, _version5_1)); CPPUNIT_ASSERT_EQUAL(ids, cmd2->getBuckets()); CPPUNIT_ASSERT(!cmd2->hasSystemState()); @@ -401,7 +399,6 @@ StorageProtocolTest::testRequestBucketInfo51() { ClusterState state("distributor:3 .1.s:d"); RequestBucketInfoCommand::SP cmd(new RequestBucketInfoCommand( - makeBucketSpace(), 3, state, "14")); RequestBucketInfoCommand::SP cmd2(copyCommand(cmd, _version5_1)); CPPUNIT_ASSERT(cmd2->hasSystemState()); @@ -660,7 +657,7 @@ StorageProtocolTest::testCreateVisitor51() buckets.push_back(document::BucketId(16, 2)); CreateVisitorCommand::SP cmd( - new CreateVisitorCommand(makeBucketSpace(), "library", "id", "doc selection")); + new CreateVisitorCommand("library", "id", "doc selection")); cmd->setControlDestination("controldest"); cmd->setDataDestination("datadest"); cmd->setVisitorCmdId(1); |