commit 007c0166ebc88ec8bfd19ebb816e9a8389a56925
author William A. Kennington III <wak@google.com> Wed Dec 23 16:36:22 2020 -0800
committer William A. Kennington III <wak@google.com> Wed Dec 23 17:35:16 2020 -0800
tree 489c579822f5a5381dd729753cbceae2ba650880
parent cbe160c6c39a2e107700e66502377f26b12c369f

version_handler: Don't store session information immediately

This can cause spurious trigger aborts when open's fail and cleanup is
called on the failed session.

Change-Id: I1c49f248b6f56bbecc0d51fafaabe871d23b1d7d
Signed-off-by: William A. Kennington III <wak@google.com>

bmc/version-handler/test/version_open_unittest.cpp

diff --git a/bmc/version-handler/test/version_open_unittest.cpp b/bmc/version-handler/test/version_open_unittest.cpp
index 0e80a94..033b2f4 100644
--- a/bmc/version-handler/test/version_open_unittest.cpp
+++ b/bmc/version-handler/test/version_open_unittest.cpp
@@ -21,11 +21,6 @@
     {
         h = std::make_unique<VersionBlobHandler>(
             createMockVersionConfigs(blobNames, &im, &tm));
-        for (const auto& blob : blobNames)
-        {
-            EXPECT_CALL(*tm.at(blob), status())
-                .WillRepeatedly(Return(ActionStatus::unknown));
-        }
     }
 
     std::unique_ptr<blobs::GenericBlobInterface> h;
@@ -43,10 +38,10 @@
 
 TEST_F(VersionOpenBlobTest, VerifyMultipleBlobOpens)
 {
-    for (const auto& [key, val] : tm)
+    for (const auto& [_, val] : tm)
     {
         /* set the expectation that every onOpen will be triggered */
-        EXPECT_CALL(*val, trigger()).Times(1).WillOnce(Return(true));
+        EXPECT_CALL(*val, trigger()).WillOnce(Return(true));
     }
     int i{defaultSessionNumber};
     for (const auto& blob : blobNames)
@@ -57,37 +52,36 @@
 
 TEST_F(VersionOpenBlobTest, VerifyOpenAfterClose)
 {
-    EXPECT_CALL(*tm.at("blob0"), trigger())
-        .Times(2)
-        .WillRepeatedly(Return(true));
+    EXPECT_CALL(*tm.at("blob0"), trigger()).WillOnce(Return(true));
     EXPECT_TRUE(h->open(defaultSessionNumber, blobs::read, "blob0"));
+
+    EXPECT_CALL(*tm.at("blob0"), abort()).Times(1);
     EXPECT_TRUE(h->close(defaultSessionNumber));
+
+    EXPECT_CALL(*tm.at("blob0"), trigger()).WillOnce(Return(true));
     EXPECT_TRUE(h->open(defaultSessionNumber, blobs::read, "blob0"));
 }
 
 TEST_F(VersionOpenBlobTest, VerifyDoubleOpenFails)
 {
-    EXPECT_CALL(*tm.at("blob1"), trigger())
-        .Times(1)
-        .WillRepeatedly(Return(true));
+    EXPECT_CALL(*tm.at("blob1"), trigger()).WillOnce(Return(true));
     EXPECT_TRUE(h->open(0, blobs::read, "blob1"));
     EXPECT_FALSE(h->open(2, blobs::read, "blob1"));
+    EXPECT_FALSE(h->open(2, blobs::read, "blob1"));
 }
 
 TEST_F(VersionOpenBlobTest, VerifyFailedTriggerFails)
 {
-    EXPECT_CALL(*tm.at("blob1"), trigger())
-        .Times(2)
-        .WillOnce(Return(false))
-        .WillOnce(Return(true));
+    EXPECT_CALL(*tm.at("blob1"), trigger()).WillOnce(Return(false));
     EXPECT_FALSE(h->open(0, blobs::read, "blob1"));
+    EXPECT_CALL(*tm.at("blob1"), trigger()).WillOnce(Return(true));
     EXPECT_TRUE(h->open(0, blobs::read, "blob1"));
 }
 
 TEST_F(VersionOpenBlobTest, VerifyUnsupportedOpenFlagsFails)
 {
-    EXPECT_CALL(*tm.at("blob1"), trigger()).Times(1).WillOnce(Return(true));
     EXPECT_FALSE(h->open(0, blobs::write, "blob1"));
+    EXPECT_CALL(*tm.at("blob1"), trigger()).WillOnce(Return(true));
     EXPECT_TRUE(h->open(0, blobs::read, "blob1"));
 }