summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-23 02:58:44 +0000
committerhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-23 02:58:44 +0000
commitb6b60c9b2afa70010fe38ed7c753f4c8e37e7131 (patch)
treee73d7765d073efe279d006955eb2c9b440cbe63e
parenta2713f1950903d34d00406f29ffe59ffcb261504 (diff)
downloadchromium_src-b6b60c9b2afa70010fe38ed7c753f4c8e37e7131.zip
chromium_src-b6b60c9b2afa70010fe38ed7c753f4c8e37e7131.tar.gz
chromium_src-b6b60c9b2afa70010fe38ed7c753f4c8e37e7131.tar.bz2
Change timeout settings in CacheTest to
make it run faster. Review URL: http://codereview.chromium.org/115678 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16833 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/net/cache_uitest.cc2
-rw-r--r--net/tools/testserver/testserver.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/net/cache_uitest.cc b/chrome/common/net/cache_uitest.cc
index 251d495..acff6a0 100644
--- a/chrome/common/net/cache_uitest.cc
+++ b/chrome/common/net/cache_uitest.cc
@@ -42,7 +42,7 @@ class CacheTest : public UITest {
private:
// Class constants
- static const int kWaitForCacheUpdateMsec = 2000;
+ static const int kWaitForCacheUpdateMsec = 1000;
static const int kCacheWaitMultiplier = 4; // Used to increase delay
// Appends a new tab to the test chrome window and loads the specified
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index a27b534..06bcfad 100644
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -263,7 +263,7 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_response(200)
self.send_header('Content-type', 'text/html')
- self.send_header('Cache-Control', 'max-age=5, private')
+ self.send_header('Cache-Control', 'max-age=3, private')
self.end_headers()
self.wfile.write('<html><head><title>%s</title></head></html>' %
@@ -280,7 +280,7 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_response(200)
self.send_header('Content-type', 'text/html')
- self.send_header('Cache-Control', 'max-age=5, public')
+ self.send_header('Cache-Control', 'max-age=3, public')
self.end_headers()
self.wfile.write('<html><head><title>%s</title></head></html>' %