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

Unified Diff: tools/chrome_proxy/webdriver/simple_smoke.py

Issue 2574923002: Add common IntegrationTest class with assertions and RunAllTests() func (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « tools/chrome_proxy/webdriver/common.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/chrome_proxy/webdriver/simple_smoke.py
diff --git a/tools/chrome_proxy/webdriver/simple_smoke.py b/tools/chrome_proxy/webdriver/simple_smoke.py
index e432e08f8c099d14b0b0c1fcf5dea1205e67e94a..31d37bfab065a5615dfe00a18e2cd19b6502934b 100644
--- a/tools/chrome_proxy/webdriver/simple_smoke.py
+++ b/tools/chrome_proxy/webdriver/simple_smoke.py
@@ -4,13 +4,13 @@
import sys
import time
-import unittest
import common
from common import TestDriver
+from common import IntegrationTest
-class SimpleSmoke(unittest.TestCase):
+class SimpleSmoke(IntegrationTest):
# Simple example integration test.
def testCheckPageWithProxy(self):
@@ -23,6 +23,20 @@ class SimpleSmoke(unittest.TestCase):
for response in responses:
print "URL: %s, ViaHeader: %s, XHR: %s" % (response.url,
response.ResponseHasViaHeader(), response.WasXHR())
+ self.assertHasChromeProxyViaHeader(response)
+
+ # Simple example integration test.
+ def testCheckPageWithoutProxy(self):
+ with TestDriver() as t:
+ t.AddChromeArg('--enable-spdy-proxy-auth')
+ t.LoadURL('https://check.googlezip.net/test.html')
+ print 'Document Title: ', t.ExecuteJavascriptStatement('document.title',
+ timeout=1)
+ responses = t.GetHTTPResponses()
+ for response in responses:
+ print "URL: %s, ViaHeader: %s, XHR: %s" % (response.url,
+ response.ResponseHasViaHeader(), response.WasXHR())
+ self.assertNotHasChromeProxyViaHeader(response)
# Show how to get a histogram.
def testPingbackHistogram(self):
@@ -41,9 +55,4 @@ class SimpleSmoke(unittest.TestCase):
'document.getElementsByClassName("pointsPanel")', 15)
if __name__ == '__main__':
- # The unittest library uses sys.argv itself and is easily confused by our
- # command line options. Pass it a simpler argv instead, while working in the
- # unittest command line args functionality.
- flags = common.ParseFlags()
- unittest.main(argv=[sys.argv[0]], verbosity=2, failfast=flags.failfast,
- catchbreak=flags.catch, buffer=(not flags.disable_buffer))
+ IntegrationTest.RunAllTests()
« no previous file with comments | « tools/chrome_proxy/webdriver/common.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698