commit 0079d8985b56b134497fc261d0f74359e0c4cb8f
author Patrick Venture <venture@google.com> Fri May 31 11:27:44 2019 -0700
committer Patrick Venture <venture@google.com> Fri May 31 11:28:14 2019 -0700
tree 6efa2a64ccb2141afb46a6ef0a130cc150cabb2c
parent 73e2bdfec7d7201ab7653aff90898a8a145dd39f

bmc: firmware updateStarted: commit(session)

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

firmware_handler.cpp

diff --git a/firmware_handler.cpp b/firmware_handler.cpp
index f648d42..d446f66 100644
--- a/firmware_handler.cpp
+++ b/firmware_handler.cpp
@@ -597,6 +597,9 @@
         case UpdateState::updatePending:
             item->second->flags |= blobs::StateFlags::committing;
             return triggerUpdate();
+        case UpdateState::updateStarted:
+            /* Calling repeatedly has no effect within an update process. */
+            return true;
         default:
             return false;
     }

test/firmware_state_updatestarted_unittest.cpp

diff --git a/test/firmware_state_updatestarted_unittest.cpp b/test/firmware_state_updatestarted_unittest.cpp
index 392ff18..8638953 100644
--- a/test/firmware_state_updatestarted_unittest.cpp
+++ b/test/firmware_state_updatestarted_unittest.cpp
@@ -142,6 +142,19 @@
 }
 
 /*
+ * commit(session)
+ */
+TEST_F(FirmwareHandlerUpdateStartedTest,
+       CallingCommitShouldReturnTrueAndHaveNoEffect)
+{
+    getToUpdateStarted();
+    EXPECT_CALL(*updateMockPtr, triggerUpdate()).Times(0);
+
+    EXPECT_TRUE(handler->commit(session, {}));
+    expectedState(FirmwareBlobHandler::UpdateState::updateStarted);
+}
+
+/*
  * stat(session) - this will trigger a check, and the state may change.
  */
 
@@ -149,9 +162,5 @@
  * TODO: close(session) - this will abort.
  */
 
-/*
- * commit(session)
- */
-
 } // namespace
 } // namespace ipmi_flash