From 6eba8ad1ab461b80f8348c923f1966a3b8b7d4e2 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 13 Apr 2022 17:50:33 +0800 Subject: [PATCH] test: add platform logic (#11459) * [TD-13558]: taos shell refactor add taosTools as submodule * add tools/taos-tools * add more client interface for taosTools compile * update taos-tools * update taos-tools * refactor shell * [TD-13558]: taos shell test speed * [TD-13558]: taos -n startup works * taos -n rpc works * taos -n server works * cleanup code since no endPort in 3.0 * update taos-tools * [TD-13558]: taos -C works * improve taos shell -c WIP * update taos-tools * add demoapi.c * adjust show databases result for 3.0 * test: add platform logic --- tests/pytest/insert/binary.py | 44 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/tests/pytest/insert/binary.py b/tests/pytest/insert/binary.py index 567a2eaad5..ffd1d6cb8c 100644 --- a/tests/pytest/insert/binary.py +++ b/tests/pytest/insert/binary.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import platform import sys from util.log import * from util.cases import * @@ -70,32 +71,27 @@ class TDTestCase: tdLog.info("tdSql.checkData(0, 0, '34567')") tdSql.checkData(0, 0, '34567') tdLog.info("insert into tb values (now+4a, \"'';\")") - config_dir = subprocess.check_output( - str("ps -ef |grep dnode1|grep -v grep |awk '{print $NF}'"), - stderr=subprocess.STDOUT, - shell=True).decode('utf-8').replace( - '\n', - '') - binPath = self.getPath("taos") - if (binPath == ""): - tdLog.exit("taos not found!") - else: - tdLog.info("taos found: %s" % binPath) + if platform.system() == "Linux": + config_dir = subprocess.check_output( + str("ps -ef |grep dnode1|grep -v grep |awk '{print $NF}'"), + stderr=subprocess.STDOUT, + shell=True).decode('utf-8').replace( + '\n', + '') - result = ''.join( - os.popen( - r"""%s -s "insert into db.tb values (now+4a, \"'';\")" -c %s""" % - (binPath, (config_dir))).readlines()) - if "Query OK" not in result: - tdLog.exit("err:insert '';") - tdLog.info('drop database db') - tdSql.execute('drop database db') - tdLog.info('show databases') - tdSql.query('show databases') - tdLog.info('tdSql.checkRow(0)') - tdSql.checkRows(1) -# convert end + binPath = self.getPath("taos") + if (binPath == ""): + tdLog.exit("taos not found!") + else: + tdLog.info("taos found: %s" % binPath) + + result = ''.join( + os.popen( + r"""%s -s "insert into db.tb values (now+4a, \"'';\")" -c %s""" % + (binPath, (config_dir))).readlines()) + if "Query OK" not in result: + tdLog.exit("err:insert '';") def stop(self): tdSql.close()