diff --git a/src/plugins/mqtt/src/mqttSystem.c b/src/plugins/mqtt/src/mqttSystem.c index 1f4e1e8a790d1a64dd899fb7826f57ff75b71e68..3266579e337c5b63032e8bcf253f87cf66252b6a 100644 --- a/src/plugins/mqtt/src/mqttSystem.c +++ b/src/plugins/mqtt/src/mqttSystem.c @@ -50,7 +50,7 @@ int32_t mqttInitSystem() { recntStatus.password = strstr(url, "@") != NULL ? strbetween(strstr(url, recntStatus.user_name), ":", "@") : NULL; if (strlen(url) == 0) { - mqttError("failed to initialize mqtt module, reason: url is null"); + mqttTrace("mqtt module not init, url is null"); return rc; } diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c index 405f796a5e2e281ee5a63bf3fed7c14426ac30b4..bdf19bb4a085159a9ee07ab7691b36dc64e257bc 100644 --- a/src/rpc/src/rpcMain.c +++ b/src/rpc/src/rpcMain.c @@ -680,13 +680,13 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) { } if (pConn) { + pConn->tretry = 0; pConn->ahandle = pContext->ahandle; sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle); } else { tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno)); } - pConn->tretry = 0; return pConn; } diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim index a5defb5914d733147a88ca6024b61e8d183f0e03..0ae687350342242d320a094e42a736aee10ba15a 100644 --- a/tests/script/general/http/restful_full.sim +++ b/tests/script/general/http/restful_full.sim @@ -147,7 +147,7 @@ print =============== step3 - db system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql print 21-> $system_content -if $system_content != @{"status":"error","code":1000,"desc":"invalid table name"}@ then +if $system_content != @{"status":"error","code":1000,"desc":"invalid table id"}@ then return -1 endi diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index b2416611cf70c44dbe17c97cec1912ee6e9cb203..1a22c3e789fc27cf8de54aaf050aa32c93f8c1f2 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -59,7 +59,6 @@ cd ../../../debug; make ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/delete.sim -#not test ./test.sh -f general/db/dropdnodes.sim ./test.sh -f general/db/len.sim ./test.sh -f general/db/repeat.sim ./test.sh -f general/db/tables.sim @@ -121,7 +120,7 @@ cd ../../../debug; make # ./test.sh -f general/parser/import_file.sim ./test.sh -f general/parser/lastrow.sim ./test.sh -f general/parser/nchar.sim -./test.sh -f general/parser/null_char.sim +#unsupport ./test.sh -f general/parser/null_char.sim ./test.sh -f general/parser/single_row_in_tb.sim ./test.sh -f general/parser/select_from_cache_disk.sim ./test.sh -f general/parser/limit.sim @@ -214,7 +213,6 @@ cd ../../../debug; make ./test.sh -f general/tag/tinyint.sim ./test.sh -f general/user/authority.sim -./test.sh -f general/user/basic1.sim ./test.sh -f general/user/monitor.sim ./test.sh -f general/user/pass_alter.sim ./test.sh -f general/user/pass_len.sim diff --git a/tests/script/jenkins/general.txt b/tests/script/jenkins/general.txt new file mode 100644 index 0000000000000000000000000000000000000000..0c14e1c7a0ffd9bf01b11312e93320dbd883380d --- /dev/null +++ b/tests/script/jenkins/general.txt @@ -0,0 +1,5 @@ +cd ../../debug; cmake .. +cd ../../debug; make + +./test.sh -f general/db/dropdnodes.sim +./test.sh -f general/user/basic1.sim diff --git a/tests/script/jenkins/sync.txt b/tests/script/jenkins/unique.txt similarity index 100% rename from tests/script/jenkins/sync.txt rename to tests/script/jenkins/unique.txt