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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py

Issue 478553002: Remove thirdparty/unittest2 from webkitpy and require python2.7. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (C) 2012 Google Inc. All rights reserved. 1 # Copyright (C) 2012 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 10 matching lines...) Expand all
21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 28
29 import re 29 import re
30 import sys 30 import sys
31 import webkitpy.thirdparty.unittest2 as unittest 31 import unittest
32 32
33 from webkitpy.common.system.executive_mock import MockExecutive 33 from webkitpy.common.system.executive_mock import MockExecutive
34 from webkitpy.common.system.outputcapture import OutputCapture 34 from webkitpy.common.system.outputcapture import OutputCapture
35 from webkitpy.common.host_mock import MockHost 35 from webkitpy.common.host_mock import MockHost
36 from webkitpy.layout_tests.port import test 36 from webkitpy.layout_tests.port import test
37 from webkitpy.layout_tests.servers.apache_http import ApacheHTTP 37 from webkitpy.layout_tests.servers.apache_http import ApacheHTTP
38 from webkitpy.layout_tests.servers.server_base import ServerError 38 from webkitpy.layout_tests.servers.server_base import ServerError
39 39
40 40
41 class TestApacheHTTP(unittest.TestCase): 41 class TestApacheHTTP(unittest.TestCase):
(...skipping 18 matching lines...) Expand all
60 oc = OutputCapture() 60 oc = OutputCapture()
61 try: 61 try:
62 oc.capture_output() 62 oc.capture_output()
63 server.start() 63 server.start()
64 server.stop() 64 server.stop()
65 finally: 65 finally:
66 _, _, logs = oc.restore_output() 66 _, _, logs = oc.restore_output()
67 self.assertIn("StartServers 4", logs) 67 self.assertIn("StartServers 4", logs)
68 self.assertIn("MinSpareServers 4", logs) 68 self.assertIn("MinSpareServers 4", logs)
69 self.assertIn("MaxSpareServers 4", logs) 69 self.assertIn("MaxSpareServers 4", logs)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698