commit da4d4a4330541e780544c75a372d24af3f0b680d
author Patrick Venture <venture@google.com> Mon Sep 28 11:41:05 2020 -0700
committer Patrick Venture <venture@google.com> Mon Sep 28 12:04:35 2020 -0700
tree 3cd8650bd55264eff5c31a2da4586690f2a42507
parent 794a37c14c98b523d72be0601b51caa2ccc45bfa

bmc/test: fixups detected in bazel-type build

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Id5a2ac8ab7a59d6483a82e51ebcb25d7aaffaf50

bmc/test/firmware_handler_unittest.cpp

diff --git a/bmc/test/firmware_handler_unittest.cpp b/bmc/test/firmware_handler_unittest.cpp
index 50d6b80..1c3cc58 100644
--- a/bmc/test/firmware_handler_unittest.cpp
+++ b/bmc/test/firmware_handler_unittest.cpp
@@ -23,7 +23,7 @@
     data.emplace_back(FirmwareFlags::UpdateFlags::ipmi, nullptr);
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        {}, std::move(data), std::move(CreateActionMap("abcd")));
+        {}, std::move(data), CreateActionMap("abcd"));
     EXPECT_EQ(handler, nullptr);
 }
 TEST(FirmwareHandlerTest, CreateEmptyDataHandlerListFails)
@@ -35,8 +35,8 @@
     blobs.emplace_back("asdf", std::make_unique<ImageHandlerMock>());
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        std::move(blobs), std::move(std::vector<DataHandlerPack>()),
-        std::move(CreateActionMap("asdf")));
+        std::move(blobs), std::vector<DataHandlerPack>(),
+        CreateActionMap("asdf"));
     EXPECT_EQ(handler, nullptr);
 }
 TEST(FirmwareHandlerTest, CreateEmptyActionPackVerifyFails)
@@ -72,7 +72,7 @@
     blobs.emplace_back(hashBlobId, std::make_unique<ImageHandlerMock>());
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        std::move(blobs), std::move(data), std::move(CreateActionMap("asdf")));
+        std::move(blobs), std::move(data), CreateActionMap("asdf"));
     EXPECT_EQ(handler, nullptr);
 
     /* Add second firmware and it'll now work. */
@@ -84,8 +84,7 @@
     data2.emplace_back(FirmwareFlags::UpdateFlags::ipmi, nullptr);
 
     handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        std::move(blobs2), std::move(data2),
-        std::move(CreateActionMap("asdf")));
+        std::move(blobs2), std::move(data2), CreateActionMap("asdf"));
 
     auto result = handler->getBlobIds();
     std::vector<std::string> expectedBlobs = {"asdf", hashBlobId};
@@ -101,7 +100,7 @@
     blobs.emplace_back("asdf", std::make_unique<ImageHandlerMock>());
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        std::move(blobs), std::move(data), std::move(CreateActionMap("asdf")));
+        std::move(blobs), std::move(data), CreateActionMap("asdf"));
     EXPECT_EQ(handler, nullptr);
 
     std::vector<HandlerPack> blobs2;
@@ -112,8 +111,7 @@
     data2.emplace_back(FirmwareFlags::UpdateFlags::ipmi, nullptr);
 
     handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        std::move(blobs2), std::move(data2),
-        std::move(CreateActionMap("asdf")));
+        std::move(blobs2), std::move(data2), CreateActionMap("asdf"));
 
     auto result = handler->getBlobIds();
     std::vector<std::string> expectedBlobs = {"asdf", hashBlobId};