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

Unified Diff: chrome/test/ui/ui_layout_test.cc

Issue 6727001: Run the Worker tests for resolveLocalFileSystemURL that were added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/ui/ui_layout_test.cc
diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index 222358b278e5679b0ad41658e34623086aed889b..a82b1f34709b436a089986958a567314ef2a8206 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -126,6 +126,17 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
new_parent_resource_path.AppendASCII("resources");
ASSERT_TRUE(file_util::CopyDirectory(
parent_resource_path, new_parent_resource_path, true));
+
+ // Copy the js test files to the same location they're copied to
+ // when running under DRT.
+ FilePath js_resources_dir = src_dir.AppendASCII("fast")
+ .AppendASCII("js")
+ .AppendASCII("resources");
+ FilePath new_js_resources_dir =
+ new_layout_test_dir_.AppendASCII("js-test-resources");
michaeln 2011/03/22 21:32:50 Geez... so the fast/js/resources are also used for
adamk 2011/03/22 21:41:00 <script src="/js-test-resources/js-test-pre.js">.
+ ASSERT_TRUE(file_util::CopyDirectory(js_resources_dir,
+ new_js_resources_dir,
+ true));
}
// Reads the layout test controller simulation script.
@@ -212,7 +223,7 @@ void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
scoped_ptr<GURL> new_test_url;
if (port != kNoHttpPort)
new_test_url.reset(new GURL(
- StringPrintf("http://localhost:%d/", port) +
+ StringPrintf("http://127.0.0.1:%d/", port) +
michaeln 2011/03/22 21:32:50 +1 on this change
adamk 2011/03/22 21:41:00 Yeah, this is something that brings us in line wit
url_path + "/" + test_case_file_name));
else
new_test_url.reset(new GURL(net::FilePathToFileURL(new_test_file_path)));

Powered by Google App Engine
This is Rietveld 408576698