xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

change

This commit is contained in:
zyyang 2020-11-04 18:57:10 +08:00
parent 97945d8c68
commit c6f6cd12be
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
View File

@ -37,18 +37,6 @@ public class TSDBDriverTest {
islibLoaded = false; islibLoaded = false;
return; return;
} }
// String libPath = null;
// switch (osName) {
// case "linux":
// libPath = "/usr/lib/libtaos.so";
// break;
// case "windows":
// libPath = "C:\\TDengine\\driver\\taos.dll";
// break;
// default:
// }
// if (libPath == null)
// return;
try { try {
System.loadLibrary("taos"); System.loadLibrary("taos");
islibLoaded = true; islibLoaded = true;
@ -58,16 +46,21 @@ public class TSDBDriverTest {
} }
try { try {
Process exec = Runtime.getRuntime().exec("ps -ef | grep taosd | grep -v \"grep\""); if (osName.equals("linux")) {
BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream())); String[] cmd = {"/bin/bash", "-c", "ps -ef | grep taosd | grep -v \"grep\""};
int lineCnt = 0; Process exec = Runtime.getRuntime().exec(cmd);
while (reader.readLine() != null) { BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream()));
lineCnt++; int lineCnt = 0;
} while (reader.readLine() != null) {
if (lineCnt > 0) lineCnt++;
isTaosdActived = true; }
else if (lineCnt > 0)
isTaosdActived = true;
else
isTaosdActived = false;
} else {
isTaosdActived = false; isTaosdActived = false;
}
} catch (IOException e) { } catch (IOException e) {
isTaosdActived = false; isTaosdActived = false;
} }
@ -146,6 +139,7 @@ public class TSDBDriverTest {
assertEquals("failure - should throw SQLException", "TDengine Error: Unable to establish connection", e.getMessage()); assertEquals("failure - should throw SQLException", "TDengine Error: Unable to establish connection", e.getMessage());
else else
fail("failure - should not throw Exception"); fail("failure - should not throw Exception");
e.printStackTrace();
} }
} }