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

fix(os): config remote server info

This commit is contained in:
afwerar 2022-05-30 10:38:29 +08:00
parent d5e07c6602
commit 6e59f7c4ee
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,8 +169,13 @@ class TDDnode:
self.cfgDict.update({option: value}) self.cfgDict.update({option: value})
def remoteExec(self, updateCfgDict, execCmd): def remoteExec(self, updateCfgDict, execCmd):
remote_conn = Connection(self.remoteIP, port=22, user='root', connect_kwargs={'password':'123456'}) try:
remote_top_dir = '~/test' config = eval(self.remoteIP)
remote_conn = Connection(host=config["host"], port=config["port"], user=config["user"], connect_kwargs={'password':config["password"]})
remote_top_dir = config["path"]
except Exception as r:
remote_conn = Connection(host=self.remoteIP, port=22, user='root', connect_kwargs={'password':'123456'})
remote_top_dir = '~/test'
valgrindStr = '' valgrindStr = ''
if (self.valgrind==1): if (self.valgrind==1):
valgrindStr = '-g' valgrindStr = '-g'

6
tests/system-test/test.py
View File

@ -145,7 +145,11 @@ if __name__ == "__main__":
if masterIp == "": if masterIp == "":
host = '127.0.0.1' host = '127.0.0.1'
else: else:
host = masterIp try:
config = eval(masterIp)
host = config["host"]
except Exception as r:
host = masterIp
tdLog.info("Procedures for tdengine deployed in %s" % (host)) tdLog.info("Procedures for tdengine deployed in %s" % (host))
if windows: if windows: