diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 21:14:07 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 21:14:07 +0000 |
| commit | f756abf74be7ce47d482f9760eacb608c9f0e121 (patch) | |
| tree | d1b89cf6e6dff544ecfff0424f4f0b728b540f49 /chrome/test | |
| parent | 8756e6680ae0d217e99f1f5a92afdd2695d11327 (diff) | |
| download | chromium_src-f756abf74be7ce47d482f9760eacb608c9f0e121.zip chromium_src-f756abf74be7ce47d482f9760eacb608c9f0e121.tar.gz chromium_src-f756abf74be7ce47d482f9760eacb608c9f0e121.tar.bz2 | |
Don't delete npapi plugins copied into <(PRODUCT_DIR)/plugins
during UI tests.
The layout test plugin is copied over via a build step and needed
when running the layout tests. If you run the UI tests before
the layout tests, the npapi layout test plugin is deleted and
causes layout tests to fail. Seems like it's safe to keep the plugins
even after the UI tests end.
Review URL: http://codereview.chromium.org/3066033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/npapi_test_helper.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/ui/npapi_test_helper.cc b/chrome/test/ui/npapi_test_helper.cc index 2bf6f10..142539c 100644 --- a/chrome/test/ui/npapi_test_helper.cc +++ b/chrome/test/ui/npapi_test_helper.cc @@ -37,6 +37,8 @@ NPAPITesterBase::NPAPITesterBase(const std::string& test_plugin_name) void NPAPITesterBase::SetUp() { // We need to copy our test-plugin into the plugins directory so that // the browser can load it. + // TODO(tc): We should copy the plugins as a build step, not during + // the tests. Then we don't have to clean up after the copy in the test. FilePath plugins_directory = GetPluginsDirectory(); FilePath plugin_src = browser_directory_.AppendASCII(test_plugin_name_); ASSERT_TRUE(file_util::PathExists(plugin_src)); @@ -60,7 +62,6 @@ void NPAPITesterBase::TearDown() { // Tear down the UI test first so that the browser stops using the plugin // files. UITest::TearDown(); - EXPECT_TRUE(file_util::DieFileDie(test_plugin_path_, true)); } FilePath NPAPITesterBase::GetPluginsDirectory() { @@ -91,9 +92,6 @@ void NPAPITester::TearDown() { // Tear down the base class first so that the browser stops using the plugin // files. NPAPITesterBase::TearDown(); -#if defined(OS_MACOSX) - EXPECT_TRUE(file_util::DieFileDie(layout_plugin_path_, true)); -#endif // OS_MACOSX } // NPAPIVisiblePluginTester members. |