summaryrefslogtreecommitdiffstats
path: root/webkit/appcache
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/appcache')
-rw-r--r--webkit/appcache/appcache_update_job.cc6
-rw-r--r--webkit/appcache/appcache_update_job_unittest.cc6
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index 7732faf..a22b561 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -244,7 +244,7 @@ void AppCacheUpdateJob::HandleManifestFetchCompleted(URLRequest* request) {
manifest_url_request_ = NULL;
if (!request->status().is_success()) {
- LOG(INFO) << "Request non-success, status: " << request->status().status()
+ LOG(ERROR) << "Request non-success, status: " << request->status().status()
<< " os_error: " << request->status().os_error();
internal_state_ = CACHE_FAILURE;
MaybeCompleteUpdate(); // if not done, run async cache failure steps
@@ -268,7 +268,7 @@ void AppCacheUpdateJob::HandleManifestFetchCompleted(URLRequest* request) {
NotifyAllPendingMasterHosts(ERROR_EVENT);
DeleteSoon();
} else {
- LOG(INFO) << "Cache failure, response code: " << response_code;
+ LOG(ERROR) << "Cache failure, response code: " << response_code;
internal_state_ = CACHE_FAILURE;
MaybeCompleteUpdate(); // if not done, run async cache failure steps
}
@@ -287,7 +287,7 @@ void AppCacheUpdateJob::ContinueHandleManifestFetchCompleted(bool changed) {
Manifest manifest;
if (!ParseManifest(manifest_url_, manifest_data_.data(),
manifest_data_.length(), manifest)) {
- LOG(INFO) << "Failed to parse manifest: " << manifest_url_;
+ LOG(ERROR) << "Failed to parse manifest: " << manifest_url_;
internal_state_ = CACHE_FAILURE;
MaybeCompleteUpdate(); // if not done, run async cache failure steps
return;
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index 9fda1c6..e46de0c 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -1145,11 +1145,11 @@ TEST_F(AppCacheUpdateJobTest, BasicCacheAttemptSuccess) {
RunTestOnIOThread(&AppCacheUpdateJobTest::BasicCacheAttemptSuccessTest);
}
-TEST_F(AppCacheUpdateJobTest, BasicUpgradeSuccess) {
+TEST_F(AppCacheUpdateJobTest, DISABLED_BasicUpgradeSuccess) {
RunTestOnIOThread(&AppCacheUpdateJobTest::BasicUpgradeSuccessTest);
}
-TEST_F(AppCacheUpdateJobTest, UpgradeSuccessMergedTypes) {
+TEST_F(AppCacheUpdateJobTest, DISABLED_UpgradeSuccessMergedTypes) {
RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeSuccessMergedTypesTest);
}
@@ -1165,7 +1165,7 @@ TEST_F(AppCacheUpdateJobTest, UpgradeFailMasterUrlFetch) {
RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeFailMasterUrlFetchTest);
}
-TEST_F(AppCacheUpdateJobTest, EmptyManifest) {
+TEST_F(AppCacheUpdateJobTest, DISABLED_EmptyManifest) {
RunTestOnIOThread(&AppCacheUpdateJobTest::EmptyManifestTest);
}