Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: chrome/installer/util/product_unittest.cc

Issue 9406017: Flakiness cleanup: disable flaky tests under chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/installer/util/product_unittest.h" 5 #include "chrome/installer/util/product_unittest.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/test/test_reg_util_win.h" 8 #include "base/test/test_reg_util_win.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/installer/util/chrome_frame_distribution.h" 10 #include "chrome/installer/util/chrome_frame_distribution.h"
(...skipping 29 matching lines...) Expand all
40 } 40 }
41 41
42 //////////////////////////////////////////////////////////////////////////////// 42 ////////////////////////////////////////////////////////////////////////////////
43 43
44 class ProductTest : public TestWithTempDirAndDeleteTempOverrideKeys { 44 class ProductTest : public TestWithTempDirAndDeleteTempOverrideKeys {
45 protected: 45 protected:
46 }; 46 };
47 47
48 // This test is flaky on Win, see http://crbug.com/100567 48 // This test is flaky on Win, see http://crbug.com/100567
49 #if defined(OS_WIN) 49 #if defined(OS_WIN)
50 #define MAYBE_ProductInstallBasic FLAKY_ProductInstallBasic 50 #define MAYBE_ProductInstallBasic DISABLED_ProductInstallBasic
51 #else 51 #else
52 #define MAYBE_ProductInstallBasic ProductInstallBasic 52 #define MAYBE_ProductInstallBasic ProductInstallBasic
53 #endif 53 #endif
54 54
55 TEST_F(ProductTest, MAYBE_ProductInstallBasic) { 55 TEST_F(ProductTest, MAYBE_ProductInstallBasic) {
56 // TODO(tommi): We should mock this and use our mocked distribution. 56 // TODO(tommi): We should mock this and use our mocked distribution.
57 const bool multi_install = false; 57 const bool multi_install = false;
58 const bool system_level = true; 58 const bool system_level = true;
59 CommandLine cmd_line = CommandLine::FromString( 59 CommandLine cmd_line = CommandLine::FromString(
60 std::wstring(L"setup.exe") + 60 std::wstring(L"setup.exe") +
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (chrome_state != NULL) 128 if (chrome_state != NULL)
129 EXPECT_TRUE(chrome_state->is_msi()); 129 EXPECT_TRUE(chrome_state->is_msi());
130 } 130 }
131 } 131 }
132 132
133 TEST_F(ProductTest, LaunchChrome) { 133 TEST_F(ProductTest, LaunchChrome) {
134 // TODO(tommi): Test Product::LaunchChrome and 134 // TODO(tommi): Test Product::LaunchChrome and
135 // Product::LaunchChromeAndWait. 135 // Product::LaunchChromeAndWait.
136 LOG(ERROR) << "Test not implemented."; 136 LOG(ERROR) << "Test not implemented.";
137 } 137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698