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

Unified Diff: native_client_sdk/src/tools/tests/httpd_test.py

Issue 351963003: [NaCl SDK] Simplify httpd.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « native_client_sdk/src/tools/run.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tools/tests/httpd_test.py
diff --git a/native_client_sdk/src/tools/tests/httpd_test.py b/native_client_sdk/src/tools/tests/httpd_test.py
index 01ff15569a8fa77bc1f9c2176545d96cecd1cf2d..9cdeaeca1f57b68d870ab8f471a98e2135ced612 100755
--- a/native_client_sdk/src/tools/tests/httpd_test.py
+++ b/native_client_sdk/src/tools/tests/httpd_test.py
@@ -21,7 +21,7 @@ import httpd
class HTTPDTest(unittest.TestCase):
def setUp(self):
- self.server = httpd.LocalHTTPServer('.', 0, False)
+ self.server = httpd.LocalHTTPServer('.', 0)
def tearDown(self):
self.server.Shutdown()
@@ -66,7 +66,7 @@ class RunTest(unittest.TestCase):
def _GetChromeMockArgs(self, page, http_request_type, sleep,
expect_to_be_killed=True):
- args = ['--test-mode']
+ args = []
if page:
args.extend(['-P', page])
args.append('--')
@@ -92,20 +92,6 @@ class RunTest(unittest.TestCase):
self.assertNotEqual(-1, returncode)
self.assertTrue('Starting' in stdout)
- def testPostOk(self):
- args = self._GetChromeMockArgs('ok', 'post', sleep=10)
- returncode, stdout, _ = self._Run(args, timeout=20)
- self.assertEqual(0, returncode)
- self.assertTrue('Starting' in stdout)
- self.assertTrue('Expected to be killed' not in stdout)
-
- def testPostFail(self):
- args = self._GetChromeMockArgs('fail', 'post', sleep=10)
- returncode, stdout, _ = self._Run(args, timeout=20)
- self.assertEqual(1, returncode)
- self.assertTrue('Starting' in stdout)
- self.assertTrue('Expected to be killed' not in stdout)
-
if __name__ == '__main__':
unittest.main()
« no previous file with comments | « native_client_sdk/src/tools/run.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698