You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by er...@apache.org on 2010/11/19 08:05:38 UTC
svn commit: r1036747 - in /trafficserver/traffic/trunk/proxy: InkAPITest.cc
InkAPITestTool.cc
Author: ericb
Date: Fri Nov 19 07:05:38 2010
New Revision: 1036747
URL: http://svn.apache.org/viewvc?rev=1036747&view=rev
Log:
Fixes for regressions. Boils down to 2 issues:
1. Cache lookup happens before origin lookup
2. Remap being required will bail SM too early for most tests to proceed to the testing point
Down to 10 FAILs
Modified:
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1036747&r1=1036746&r2=1036747&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Fri Nov 19 07:05:38 2010
@@ -2500,7 +2500,7 @@ mytest_handler(TSCont contp, TSEvent eve
if (test->hook_mask == 1) {
test->hook_mask |= 2;
}
-
+ TSSkipRemappingSet((TSHttpTxn) data,1);
checkHttpTxnClientReqGet(test, data);
if (TSHttpTxnReenable((TSHttpTxn) data, TS_EVENT_HTTP_CONTINUE) != TS_SUCCESS) {
@@ -2513,8 +2513,8 @@ mytest_handler(TSCont contp, TSEvent eve
break;
case TS_EVENT_HTTP_OS_DNS:
- if (test->hook_mask == 3) {
- test->hook_mask |= 4;
+ if (test->hook_mask == 7) {
+ test->hook_mask |= 8;
}
checkHttpTxnClientIncomingPortGet(test, data);
@@ -2527,19 +2527,19 @@ mytest_handler(TSCont contp, TSEvent eve
SDK_RPRINT(test->regtest, "TSHttpTxnReenable", "TestCase1", TC_FAIL,
"TSHttpTxnReenable doesn't return TS_SUCCESS");
} else {
- test->reenable_mask |= 4;
+ test->reenable_mask |= 8;
}
break;
case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE:
- if (test->hook_mask == 7) {
- test->hook_mask |= 8;
+ if (test->hook_mask == 3) {
+ test->hook_mask |= 4;
}
if (TSHttpTxnReenable((TSHttpTxn) data, TS_EVENT_HTTP_CONTINUE) != TS_SUCCESS) {
SDK_RPRINT(test->regtest, "TSHttpTxnReenable", "TestCase1", TC_FAIL,
"TSHttpTxnReenable doesn't return TS_SUCCESS");
} else {
- test->reenable_mask |= 8;
+ test->reenable_mask |= 4;
}
break;
@@ -2621,7 +2621,7 @@ mytest_handler(TSCont contp, TSEvent eve
} else {
*(test->pstatus) = REGRESSION_TEST_FAILED;
SDK_RPRINT(test->regtest, "TSHttpHookAdd", "TestCase1", TC_FAIL,
- "Hooks not called or request failure. Hook mask = %d", test->hook_mask);
+ "Hooks not called or request failure. Hook mask = %d\n %s", test->hook_mask,test->browser->response);
}
if (test->reenable_mask == 255) {
@@ -6931,6 +6931,7 @@ ssn_handler(TSCont contp, TSEvent event,
break;
case TS_EVENT_HTTP_TXN_START:
+ TSSkipRemappingSet((TSHttpTxn) edata,1);
SDK_RPRINT(data->test, "TSHttpSsnReenable", "TestCase", TC_PASS, "ok");
data->test_passed_ssn_reenable++;
{
@@ -7137,6 +7138,13 @@ cache_hook_handler(TSCont contp, TSEvent
}
switch (event) {
+ case TS_EVENT_HTTP_READ_REQUEST_HDR:
+ txnp = (TSHttpTxn) edata;
+ TSSkipRemappingSet(txnp,1);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
+ break;
+
+
case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE:
{
int lookup_status;
@@ -7304,7 +7312,8 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTx
socktest->first_time = true;
socktest->magic = MAGIC_ALIVE;
TSContDataSet(cont, socktest);
-
+
+ TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, cont);
/* Register to HTTP hooks that are called in case of a cache MISS */
TSHttpHookAdd(TS_HTTP_READ_CACHE_HDR_HOOK, cont);
TSHttpHookAdd(TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, cont);
@@ -7655,6 +7664,11 @@ transform_hook_handler(TSCont contp, TSE
switch (event) {
+ case TS_EVENT_HTTP_READ_REQUEST_HDR:
+ txnp = (TSHttpTxn) edata;
+ TSSkipRemappingSet(txnp,1);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
+ break;
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
txnp = (TSHttpTxn) edata;
/* Setup hooks for Transformation */
@@ -7826,7 +7840,7 @@ transform_hook_handler(TSCont contp, TSE
} else {
SDK_RPRINT(data->test, "TSHttpTxnTransformedResponseCache", "TestCase1", TC_FAIL, "Value's Mismatch");
}
-
+
/* Note: response is available using test->browser->response pointer */
*(data->pstatus) = REGRESSION_TEST_PASSED;
if (data->browser1->status != REQUEST_SUCCESS) {
@@ -7910,7 +7924,9 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTx
/* Prepare the buffer to be appended to responses */
load(TRANSFORM_APPEND_STRING);
-
+
+ TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, cont); //so we can skip remapping
+
/* Register to HTTP hooks that are called in case of a cache MISS */
TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, cont);
Modified: trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITestTool.cc?rev=1036747&r1=1036746&r2=1036747&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITestTool.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITestTool.cc Fri Nov 19 07:05:38 2010
@@ -185,39 +185,39 @@ generate_request(int test_case)
// We define request formats.
// Each format has an X-Request-ID field that contains the id of the testcase
-#define HTTP_REQUEST_DEFAULT_FORMAT "GET http://localhost:%d/default.html HTTP/1.0\r\n" \
+#define HTTP_REQUEST_DEFAULT_FORMAT "GET http://127.0.0.1:%d/default.html HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT1 "GET http://localhost:%d/format1.html HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT1 "GET http://127.0.0.1:%d/format1.html HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT2 "GET http://localhost:%d/format2.html HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT2 "GET http://127.0.0.1:%d/format2.html HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Content-Type: text/html\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT3 "GET http://localhost:%d/format3.html/ HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT3 "GET http://127.0.0.1:%d/format3.html/ HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Response: Error\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT4 "GET http://localhost:%d/format4.html/ HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT4 "GET http://127.0.0.1:%d/format4.html/ HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Request:%d\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT5 "GET http://localhost:%d/format5.html/ HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT5 "GET http://127.0.0.1:%d/format5.html/ HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Request:%d\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT6 "GET http://localhost:%d/format.html/ HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT6 "GET http://127.0.0.1:%d/format.html/ HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Accept-Language:English\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT7 "GET http://localhost:%d/format.html/ HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT7 "GET http://127.0.0.1:%d/format.html/ HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Accept-Language:French\r\n" \
"\r\n"
-#define HTTP_REQUEST_FORMAT8 "GET http://localhost:%d/format.html/ HTTP/1.0\r\n" \
+#define HTTP_REQUEST_FORMAT8 "GET http://127.0.0.1:%d/format.html/ HTTP/1.0\r\n" \
"X-Request-ID: %d\r\n" \
"Accept-Language:English,French\r\n" \
"\r\n"
@@ -445,7 +445,7 @@ synclient_txn_create(void)
txn->magic = MAGIC_ALIVE;
txn->connect_action = NULL;
- TSDebug(CDBG_TAG, "Connecting to proxy localhost on port %d", (int) proxy_port);
+ TSDebug(CDBG_TAG, "Connecting to proxy 127.0.0.1 on port %d", (int) proxy_port);
return txn;
}