[BattOr] Initialize BattOr before getting firmware git hash.

tools/battor_agent/battor_agent_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 
 #include "tools/battor_agent/battor_agent.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 283 matching lines @@
     GetAgent()->GetFirmwareGitHash();
     GetTaskRunner()->RunUntilIdle();
 
     GetAgent()->OnConnectionOpened(true);
     GetTaskRunner()->RunUntilIdle();
 
     if (end_state == BattOrAgentState::CONNECTED)
       return;
 
     OnBytesSent(true);
+    if (end_state == BattOrAgentState::INIT_SENT)
+      return;
+
+    OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+                  ToCharVector(kInitAck));
+    if (end_state == BattOrAgentState::INIT_ACKED)
+      return;
+
+    OnBytesSent(true);
     if (end_state == BattOrAgentState::GIT_FIRMWARE_HASH_REQUEST_SENT)
       return;
 
     DCHECK(end_state == BattOrAgentState::READ_GIT_HASH_RECEIVED);
 
     std::unique_ptr<std::vector<char>> firmware_git_hash_vector(
         new std::vector<char>{'G', 'I', 'T', 'H', 'A', 'S', 'H'});
     OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
                   std::move(firmware_git_hash_vector));
   }
@@ skipping 64 matching lines @@
   GetAgent()->StartTracing();
   GetTaskRunner()->RunUntilIdle();
 
   GetAgent()->OnConnectionOpened(false);
   GetTaskRunner()->RunUntilIdle();
 
   EXPECT_TRUE(IsCommandComplete());
   EXPECT_EQ(BATTOR_ERROR_CONNECTION_FAILED, GetCommandError());
 }
 
 TEST_F(BattOrAgentTest, StartTracingFailsIfInitSendFails) {

[charliea (OOO until 10-5), 2017/01/12 17:05:50]

Seems like we probably want a similar test for getting the git hash?

[rnephew (Reviews Here), 2017/01/12 17:53:21]

Done.

   RunStartTracingTo(BattOrAgentState::CONNECTED);
   OnBytesSent(false);
 
   EXPECT_TRUE(IsCommandComplete());
   EXPECT_EQ(BATTOR_ERROR_SEND_ERROR, GetCommandError());
 }
 
 TEST_F(BattOrAgentTest, StartTracingFailsIfInitAckReadFails) {

[charliea (OOO until 10-5), 2017/01/12 17:05:50]

same

[rnephew (Reviews Here), 2017/01/12 17:53:21]

Done.

   RunStartTracingTo(BattOrAgentState::INIT_SENT);
 
   for (int i = 0; i < 21; i++) {
     OnMessageRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
 
     // Bytes will be sent because INIT will be retried.
     OnBytesSent(true);
   }
 
   EXPECT_TRUE(IsCommandComplete());
   EXPECT_EQ(BATTOR_ERROR_TOO_MANY_INIT_RETRIES, GetCommandError());
 }
 
 TEST_F(BattOrAgentTest, StartTracingFailsIfInitWrongAckRead) {

[charliea (OOO until 10-5), 2017/01/12 17:05:50]

same

[rnephew (Reviews Here), 2017/01/12 17:53:21]

Done.

   RunStartTracingTo(BattOrAgentState::INIT_SENT);
 
   for (int i = 0; i < 21; i++) {
     OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
                   ToCharVector(kStartTracingAck));
 
     // Bytes will be sent because INIT will be retried.
     OnBytesSent(true);
   }
 
@@ skipping 600 matching lines @@
   RunGetFirmwareGitHashTo(BattOrAgentState::GIT_FIRMWARE_HASH_REQUEST_SENT);
 
   uint32_t current_sample = 1;
   OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL,
                 ToCharVector(current_sample));
 
   EXPECT_TRUE(IsCommandComplete());
   EXPECT_EQ(BATTOR_ERROR_UNEXPECTED_MESSAGE, GetCommandError());
 }
 }  // namespace battor