Repository: trafficserver Updated Branches: refs/heads/master 70f464387 -> 8898b907f
Correct connect_attempts tests to match the implementation we settled on Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8898b907 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8898b907 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8898b907 Branch: refs/heads/master Commit: 8898b907fa39eeec034eee07e4ec79ed545865df Parents: 70f4643 Author: Thomas Jackson <[email protected]> Authored: Fri Aug 28 18:52:21 2015 -0700 Committer: Thomas Jackson <[email protected]> Committed: Fri Aug 28 18:52:21 2015 -0700 ---------------------------------------------------------------------- ci/tsqa/tests/test_connect_attempts.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8898b907/ci/tsqa/tests/test_connect_attempts.py ---------------------------------------------------------------------- diff --git a/ci/tsqa/tests/test_connect_attempts.py b/ci/tsqa/tests/test_connect_attempts.py index d5b7117..58d70e1 100644 --- a/ci/tsqa/tests/test_connect_attempts.py +++ b/ci/tsqa/tests/test_connect_attempts.py @@ -97,7 +97,7 @@ def thread_partial_response(sock): connection, addr = sock.accept() num_requests += 1 if first: - connection.send('HTTP/1.1 200 OK\r\n') + connection.send('HTTP/1.1 500 Internal Server Error\r\n') connection.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack('ii', 1, 0)) connection.close() first = False @@ -192,14 +192,13 @@ class TestOriginServerConnectAttempts(helpers.EnvironmentCase): ''' url = 'http://127.0.0.1:{0}/partial_response/s'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports']) ret = requests.get(url) - self.assertEqual(ret.status_code, 502) + self.assertEqual(ret.status_code, 500) def test_reset_after_accept_origin(self): - '''Verify that we get 200s from origins that reset_after_accept''' + '''Verify that we get 502s from origins that reset_after_accept, once any bytes are sent to origin we assume we cannot re-dispatch''' url = 'http://127.0.0.1:{0}/reset_after_accept/s'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports']) ret = requests.get(url) - self.assertEqual(ret.status_code, 200) - self.assertGreater(int(ret.text), 0) + self.assertEqual(ret.status_code, 502) def test_delayed_accept_after_connect_origin(self): '''Verify that we get 200s from origins that delayed_accept_after_connect'''
