AU: Reduce instances of signalling the crash reporter.

omaha_request_action_unittest.cc

 // Copyright (c) 2010 The Chromium OS 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 <string>
 #include <vector>
 
 #include <glib.h>
 
 #include "base/string_util.h"
@@ skipping 180 matching lines @@
     *out_post_data = fetcher->post_data();
   return collector_action.has_input_object_;
 }
 
 // Tests Event requests -- they should always succeed. |out_post_data|
 // may be null; if non-null, the post-data received by the mock
 // HttpFetcher is returned.
 void TestEvent(const OmahaRequestParams& params,
                OmahaEvent* event,
                const string& http_response,
-               vector<char>* out_post_data) {
+               vector<char>* out_post_data,
+               int expected_http_response_code) {
   GMainLoop* loop = g_main_loop_new(g_main_context_default(), FALSE);
   MockHttpFetcher* fetcher = new MockHttpFetcher(http_response.data(),
                                                  http_response.size(),
                                                  NULL);
   NiceMock<PrefsMock> prefs;
   OmahaRequestAction action(&prefs, params, event, fetcher);
   OmahaRequestActionTestProcessorDelegate delegate;
+  if (expected_http_response_code < 200 || expected_http_response_code > 299) {
+    fetcher->FailTransfer(expected_http_response_code);
+    delegate.expected_code_ =
+        static_cast<ActionExitCode>(kActionCodeOmahaRequestHTTPResponseBase +
+                                    expected_http_response_code);
+  }
   delegate.loop_ = loop;
   ActionProcessor processor;
   processor.set_delegate(&delegate);
   processor.EnqueueAction(&action);
 
   g_timeout_add(0, &StartProcessorInRunLoop, &processor);
   g_main_loop_run(loop);
   g_main_loop_unref(loop);
   if (out_post_data)
     *out_post_data = fetcher->post_data();
@@ skipping 350 matching lines @@
       OmahaEvent::kTypeUpdateComplete,
       OmahaEvent::kResultSuccessReboot);
   EXPECT_NE(post_str.find(prev_version_event), string::npos);
 }
 
 TEST(OmahaRequestActionTest, FormatSuccessEventOutputTest) {
   vector<char> post_data;
   TestEvent(kDefaultTestParams,
             new OmahaEvent(OmahaEvent::kTypeUpdateDownloadStarted),
             "invalid xml>",
-            &post_data);
+            &post_data,
+            200);
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   string expected_event = StringPrintf(
       "        <o:event eventtype=\"%d\" eventresult=\"%d\"></o:event>\n",
       OmahaEvent::kTypeUpdateDownloadStarted,
       OmahaEvent::kResultSuccess);
   EXPECT_NE(post_str.find(expected_event), string::npos);
   EXPECT_EQ(post_str.find("o:ping"), string::npos);
   EXPECT_EQ(post_str.find("o:updatecheck"), string::npos);
 }
 
 TEST(OmahaRequestActionTest, FormatErrorEventOutputTest) {
   vector<char> post_data;
   TestEvent(kDefaultTestParams,
             new OmahaEvent(OmahaEvent::kTypeDownloadComplete,
                            OmahaEvent::kResultError,
                            kActionCodeError),
             "invalid xml>",
-            &post_data);
+            &post_data,
+            200);
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   string expected_event = StringPrintf(
       "        <o:event eventtype=\"%d\" eventresult=\"%d\" "
       "errorcode=\"%d\"></o:event>\n",
       OmahaEvent::kTypeDownloadComplete,
       OmahaEvent::kResultError,
       kActionCodeError);
   EXPECT_NE(post_str.find(expected_event), string::npos);
   EXPECT_EQ(post_str.find("o:updatecheck"), string::npos);
 }
 
 TEST(OmahaRequestActionTest, FormatEventOutputTest) {
   vector<char> post_data;
   TestEvent(kDefaultTestParams,
             new OmahaEvent(OmahaEvent::kTypeDownloadComplete,
                            OmahaEvent::kResultError,
                            kActionCodeError),
             "invalid xml>",
-            &post_data);
+            &post_data,
+            200);
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   string expected_event = StringPrintf(
       "        <o:event eventtype=\"%d\" eventresult=\"%d\" "
       "errorcode=\"%d\"></o:event>\n",
       OmahaEvent::kTypeDownloadComplete,
       OmahaEvent::kResultError,
       kActionCodeError);
   EXPECT_NE(post_str.find(expected_event), string::npos);
   EXPECT_EQ(post_str.find("o:updatecheck"), string::npos);
 }
 
+TEST(OmahaRequestActionTest, EventFailureTest) {
+  vector<char> post_data;
+  TestEvent(kDefaultTestParams,
+            new OmahaEvent(OmahaEvent::kTypeUpdateDownloadStarted),
+            "foo",
+            NULL,
+            500);
+}
+
 TEST(OmahaRequestActionTest, IsEventTest) {
   string http_response("doesn't matter");
   NiceMock<PrefsMock> prefs;
   OmahaRequestAction update_check_action(
       &prefs,
       kDefaultTestParams,
       NULL,
       new MockHttpFetcher(http_response.data(),
                           http_response.size(),
                           NULL));
@@ skipping 282 matching lines @@
                       "",
                       1500,
                       static_cast<ActionExitCode>(
                           kActionCodeOmahaRequestHTTPResponseBase + 999),
                       &response,
                       NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 }  // namespace chromeos_update_engine