Commit 05b55db9 authored by michaeln@google.com's avatar michaeln@google.com

Disable WebstoreInstallerTests on mac+win debug.

BUG=113024 
TBR=benjhayden
Review URL: https://chromiumcodereview.appspot.com/9356001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120814 0039d316-1c4b-4281-b951-d872f2087c98
parent 73549429
...@@ -28,6 +28,13 @@ const char kWebstoreDomain[] = "cws.com"; ...@@ -28,6 +28,13 @@ const char kWebstoreDomain[] = "cws.com";
const char kAppDomain[] = "app.com"; const char kAppDomain[] = "app.com";
const char kNonAppDomain[] = "nonapp.com"; const char kNonAppDomain[] = "nonapp.com";
// http://crbug.com/113024
#if !defined(NDEBUG) && (defined(OS_WIN) || defined(OS_MACOSX))
#define MAYBE(TestName) DISABLED_ ## TestName
#else
#define MAYBE(TestName) TestName
#endif
class WebstoreInlineInstallTest : public InProcessBrowserTest { class WebstoreInlineInstallTest : public InProcessBrowserTest {
public: public:
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
...@@ -81,7 +88,7 @@ class WebstoreInlineInstallTest : public InProcessBrowserTest { ...@@ -81,7 +88,7 @@ class WebstoreInlineInstallTest : public InProcessBrowserTest {
std::string test_gallery_url_; std::string test_gallery_url_;
}; };
IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, Install) { IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, MAYBE(Install)) {
CommandLine::ForCurrentProcess()->AppendSwitchASCII( CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kAppsGalleryInstallAutoConfirmForTests, "accept"); switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
...@@ -95,8 +102,8 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, Install) { ...@@ -95,8 +102,8 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, Install) {
EXPECT_TRUE(extension); EXPECT_TRUE(extension);
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest,
WebstoreInlineInstallTest, InstallNotAllowedFromNonVerifiedDomains) { MAYBE(InstallNotAllowedFromNonVerifiedDomains)) {
CommandLine::ForCurrentProcess()->AppendSwitchASCII( CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kAppsGalleryInstallAutoConfirmForTests, "cancel"); switches::kAppsGalleryInstallAutoConfirmForTests, "cancel");
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
...@@ -123,7 +130,8 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, ArgumentValidation) { ...@@ -123,7 +130,8 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, ArgumentValidation) {
RunInlineInstallTest("runTest"); RunInlineInstallTest("runTest");
} }
IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, InstallNotSupported) { IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest,
MAYBE(InstallNotSupported)) {
CommandLine::ForCurrentProcess()->AppendSwitchASCII( CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kAppsGalleryInstallAutoConfirmForTests, "cancel"); switches::kAppsGalleryInstallAutoConfirmForTests, "cancel");
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
...@@ -161,7 +169,8 @@ class WebstoreInlineInstallUnpackFailureTest ...@@ -161,7 +169,8 @@ class WebstoreInlineInstallUnpackFailureTest
} }
}; };
IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallUnpackFailureTest, Test) { IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallUnpackFailureTest,
MAYBE(WebstoreInlineInstallUnpackFailureTest)) {
CommandLine::ForCurrentProcess()->AppendSwitchASCII( CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kAppsGalleryInstallAutoConfirmForTests, "accept"); switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment