OLD | NEW |
1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 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 |
11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the |
12 # distribution. | 12 # distribution. |
13 # * Neither the name of Google Inc. nor the names of its | 13 # * Neither the name of Google Inc. nor the names of its |
14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from |
15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. |
16 # | 16 # |
17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
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 """Integration tests for the new-run-webkit-httpd and new-run-webkit-websocketse
rver scripts""" | 29 """Integration tests for the run-blink-httpd and run-blink-websocketserver scrip
ts""" |
30 | 30 |
31 # FIXME: Rename this file to something more descriptive. | 31 # FIXME: Rename this file to something more descriptive. |
32 | 32 |
33 import errno | 33 import errno |
34 import os | 34 import os |
35 import socket | 35 import socket |
36 import subprocess | 36 import subprocess |
37 import sys | 37 import sys |
38 import tempfile | 38 import tempfile |
39 import unittest2 as unittest | 39 import unittest2 as unittest |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 self.maybe_make_dir(tmpdir, 'media') | 124 self.maybe_make_dir(tmpdir, 'media') |
125 | 125 |
126 self.assert_servers_are_down([18000]) | 126 self.assert_servers_are_down([18000]) |
127 self.assertEqual(self.run_script(['--server', 'start', '--port=18000', '
--root', tmpdir]), 0) | 127 self.assertEqual(self.run_script(['--server', 'start', '--port=18000', '
--root', tmpdir]), 0) |
128 self.assert_servers_are_up([18000]) | 128 self.assert_servers_are_up([18000]) |
129 self.assertEqual(self.run_script(['--server', 'stop']), 0) | 129 self.assertEqual(self.run_script(['--server', 'stop']), 0) |
130 self.assert_servers_are_down([18000]) | 130 self.assert_servers_are_down([18000]) |
131 | 131 |
132 | 132 |
133 class HTTPServerTest(BaseTest): | 133 class HTTPServerTest(BaseTest): |
134 """Tests that new-run-webkit-http must pass.""" | 134 """Tests that run-blink-http must pass.""" |
135 | 135 |
136 PORTS = (8000, 8080, 8443) | 136 PORTS = (8000, 8080, 8443) |
137 SCRIPT_NAME = 'new-run-webkit-httpd' | 137 SCRIPT_NAME = 'run-blink-httpd' |
138 | 138 |
139 | 139 |
140 class WebsocketserverTest(BaseTest): | 140 class WebsocketserverTest(BaseTest): |
141 """Tests that new-run-webkit-websocketserver must pass.""" | 141 """Tests that run-blink-websocketserver must pass.""" |
142 | 142 |
143 # FIXME: test TLS at some point? | 143 # FIXME: test TLS at some point? |
144 PORTS = (8880, ) | 144 PORTS = (8880, ) |
145 SCRIPT_NAME = 'new-run-webkit-websocketserver' | 145 SCRIPT_NAME = 'run-blink-websocketserver' |
OLD | NEW |