You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ja...@apache.org on 2015/05/01 02:01:16 UTC

[1/4] trafficserver git commit: Use requests instead of raw sockets

Repository: trafficserver
Updated Branches:
  refs/heads/master 189c843f3 -> 6f71be9b3


Use requests instead of raw sockets


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c4a18790
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c4a18790
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c4a18790

Branch: refs/heads/master
Commit: c4a187905cbdb719b428010d2d4c032e00b76fe1
Parents: 189c843
Author: Thomas Jackson <ja...@apache.org>
Authored: Thu Apr 30 16:44:04 2015 -0700
Committer: Thomas Jackson <ja...@apache.org>
Committed: Thu Apr 30 16:44:04 2015 -0700

----------------------------------------------------------------------
 ci/tsqa/tests/test_keepalive.py | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c4a18790/ci/tsqa/tests/test_keepalive.py
----------------------------------------------------------------------
diff --git a/ci/tsqa/tests/test_keepalive.py b/ci/tsqa/tests/test_keepalive.py
index 0e501ce..3e77388 100644
--- a/ci/tsqa/tests/test_keepalive.py
+++ b/ci/tsqa/tests/test_keepalive.py
@@ -77,22 +77,16 @@ class KeepAliveInMixin(object):
         return request
 
     def _aux_KA_working_path_connid(self, protocol, headers=None):
-        # connect tcp
-        s = self._get_socket()
-
-        request = ('GET / HTTP/1.1\r\n'
-                   'Host: foobar.com\r\n')
-        request += self._headers_to_str(headers)
-        request += '\r\n'
-
-        for x in xrange(1, 10):
-            s.send(request)
-            response = s.recv(4096)
-            # cheat, since we know what the body should have
-            if '\r\n\r\n' not in response:
-                response += s.recv(4096)
-            self.assertIn('HTTP/1.1 200 OK', response)
-            self.assertIn('hello', response)
+        with requests.Session() as s:
+            url = '{0}://127.0.0.1:{1}/'.format(protocol, int(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports']))
+            conn_id = None
+            for x in xrange(1, 10):
+                ret = requests.get(url)
+                self.assertEqual(ret.status_code, 200)
+                if conn_id is None:
+                    conn_id = ret.text
+                else:
+                    self.assertEqual(ret.text, conn_id)
 
     def _aux_working_path(self, protocol, headers=None):
         # connect tcp


[2/4] trafficserver git commit: Mark the failures from TS-3518 as expected failures until a fix is committed

Posted by ja...@apache.org.
Mark the failures from TS-3518 as expected failures until a fix is committed


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7759b247
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7759b247
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7759b247

Branch: refs/heads/master
Commit: 7759b24709625f1f6e619713108efed1526f8b3b
Parents: c4a1879
Author: Thomas Jackson <ja...@apache.org>
Authored: Thu Apr 30 16:47:21 2015 -0700
Committer: Thomas Jackson <ja...@apache.org>
Committed: Thu Apr 30 16:47:21 2015 -0700

----------------------------------------------------------------------
 ci/tsqa/tests/test_https.py | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7759b247/ci/tsqa/tests/test_https.py
----------------------------------------------------------------------
diff --git a/ci/tsqa/tests/test_https.py b/ci/tsqa/tests/test_https.py
index a8914e6..9273b4f 100644
--- a/ci/tsqa/tests/test_https.py
+++ b/ci/tsqa/tests/test_https.py
@@ -20,6 +20,7 @@ import socket
 
 import helpers
 import tsqa.utils
+unittest = tsqa.utils.import_unittest()
 
 # some ciphers to test with
 CIPHER_MAP = {
@@ -266,8 +267,12 @@ class TestMix(helpers.EnvironmentCase, CertSelectionMixin):
         cert = self._get_cert(addr, ciphers=CIPHER_MAP['ecdsa'])
         self.assertEqual(cert.get_subject().commonName.decode(), 'www.example.com')
 
+    # TODO: remove once TS-3518 is resolved
+    @unittest.expectedFailure
     def test_intermediate_ca_rsa(self):
         self._intermediate_ca_t('rsa')
 
+    # TODO: remove once TS-3518 is resolved
+    @unittest.expectedFailure
     def test_intermediate_ca_ecdsa(self):
         self._intermediate_ca_t('ecdsa')


[3/4] trafficserver git commit: Add ExpectedFailure for testcase of TS-3440

Posted by ja...@apache.org.
Add ExpectedFailure for testcase of TS-3440


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3ac5114c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3ac5114c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3ac5114c

Branch: refs/heads/master
Commit: 3ac5114cd4d9c11db4ad7052ba5612c7399b4d10
Parents: 7759b24
Author: Thomas Jackson <ja...@apache.org>
Authored: Thu Apr 30 16:53:19 2015 -0700
Committer: Thomas Jackson <ja...@apache.org>
Committed: Thu Apr 30 16:53:19 2015 -0700

----------------------------------------------------------------------
 ci/tsqa/tests/test_connect_attempts.py | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3ac5114c/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 9979e33..0a29632 100644
--- a/ci/tsqa/tests/test_connect_attempts.py
+++ b/ci/tsqa/tests/test_connect_attempts.py
@@ -181,6 +181,8 @@ class TestOriginServerConnectAttempts(helpers.EnvironmentCase):
 
     # TODO: FIX THIS!!! The test is correct, ATS isn't!
     # we should fail in this case-- or at least have a config which lets you control
+    # TODO: remove once TS-3440 is resolved
+    @unittest.expectedFailure
     def test_partial_response_origin(self):
         '''
         Verify that we get 504s from origins that return a partial_response


[4/4] trafficserver git commit: Correct exception name, now that we enforce a timeout

Posted by ja...@apache.org.
Correct exception name, now that we enforce a timeout


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6f71be9b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6f71be9b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6f71be9b

Branch: refs/heads/master
Commit: 6f71be9b33e9f64581ec06529b90377fdc890208
Parents: 3ac5114
Author: Thomas Jackson <ja...@apache.org>
Authored: Thu Apr 30 17:00:38 2015 -0700
Committer: Thomas Jackson <ja...@apache.org>
Committed: Thu Apr 30 17:00:48 2015 -0700

----------------------------------------------------------------------
 ci/tsqa/tests/test_chunked.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f71be9b/ci/tsqa/tests/test_chunked.py
----------------------------------------------------------------------
diff --git a/ci/tsqa/tests/test_chunked.py b/ci/tsqa/tests/test_chunked.py
index 9b7fdc0..5d265f4 100644
--- a/ci/tsqa/tests/test_chunked.py
+++ b/ci/tsqa/tests/test_chunked.py
@@ -192,5 +192,5 @@ class TestChunked(helpers.EnvironmentCase):
 
     def test_chunked_bad_close(self):
         url = 'http://127.0.0.1:{0}/5/0.1/false'.format(self.port)
-        with self.assertRaises(requests.exceptions.ConnectionError):
+        with self.assertRaises(socket.timeout):
             ret = requests.get(url, proxies=self.proxies, timeout=2)