summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authormpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 00:08:14 +0000
committermpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 00:08:14 +0000
commit23f0fe6e9b9b90761b5919fd4ad712b30ddaf74b (patch)
tree6131b5923e3269d5719b9ac51788a01aaa0f682f /net/url_request
parent7c36ac0734100613e58a40f6563f7aedff0a4f77 (diff)
downloadchromium_src-23f0fe6e9b9b90761b5919fd4ad712b30ddaf74b.zip
chromium_src-23f0fe6e9b9b90761b5919fd4ad712b30ddaf74b.tar.gz
chromium_src-23f0fe6e9b9b90761b5919fd4ad712b30ddaf74b.tar.bz2
Revert 286024 "Move the test data that's used by net_unittests t..."
Likely cause of failure on tree: http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29/builds/32682 net_unittests net_unittests net_unittests 127 disabled 6 flaky failed 5 ( 4 mins, 19 secs ) stdio Basic LargeGet LargeGetToTempFile ServerUnavailable ServerUnavailablePropagateResponse e.g., [ RUN ] URLFetcherDownloadProgressTest.Basic HTTP server started on http://127.0.0.1:54345... sending server_data: {"host": "127.0.0.1", "port": 54345} (36 bytes) File not found animate1.gif full path:/mnt/data/b/build/slave/Linux_Tests__dbg__1_/build/src/chrome/test/data/animate1.gif localhost - - [28/Jul/2014 16:51:57] code 404, message Not Found ../../net/url_request/url_fetcher_impl_unittest.cc:601: Failure Expected: (total) >= (progress), actual: -1 vs 190 ../../net/url_request/url_fetcher_impl_unittest.cc:603: Failure Value of: total Actual: -1 Expected: expected_total_ Which is: 19021 ../../net/url_request/url_fetcher_impl_unittest.cc:170: Failure Value of: source->GetResponseCode() Actual: 404 Expected: 200 [ FAILED ] URLFetcherDownloadProgressTest.Basic (205 ms) > Move the test data that's used by net_unittests to net\data to simplify the isolate files. > > The background is that url_fetcher was moved from chrome to content to net, but its test data didn't move along. > > R=davidben@chromium.org > > Review URL: https://codereview.chromium.org/420313003 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/422063008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_fetcher_impl_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index 6da5f83..39e2bb2 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -41,7 +41,7 @@ namespace {
// TODO(akalin): Move all the test data to somewhere under net/.
const base::FilePath::CharType kDocRoot[] =
- FILE_PATH_LITERAL("net/data/url_fetcher_impl_unittest");
+ FILE_PATH_LITERAL("chrome/test/data");
const char kTestServerFilePrefix[] = "files/";
class ThrottlingTestURLRequestContext : public TestURLRequestContext {