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

Merge pull request #2185 from taosdata/hotfix/sangshuduo/make-pytest-support-both-tdinternal-and-community 

make pytest support both TDinternal and community
This commit is contained in:
Shengliang Guan 2020-06-08 17:04:59 +08:00 committed by GitHub
parent b591ad7c8d 9ccf152f42
commit 0ba728cb82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/pytest/util/dnodes.py
View File

@ -194,13 +194,13 @@ class TDDnode:
selfPath = os.path.dirname(os.path.realpath(__file__))
binPath = ""
if ("TDinternal" in selfPath):
if ("community" in selfPath):
projPath = selfPath + "/../../../../"
for root, dirs, files in os.walk(projPath):
if ("taosd" in files):
rootRealPath = os.path.dirname(os.path.realpath(root))
if ("community" not in rootRealPath):
if ("packaging" not in rootRealPath):
binPath = os.path.join(root, "taosd")
break
else:
@ -213,7 +213,7 @@ class TDDnode:
break
if (binPath == ""):
tdLog.exit("taosd not found!s")
tdLog.exit("taosd not found!")
else:
tdLog.info("taosd found in %s" % rootRealPath)