Merge branch 'develop' of https://github.com/taosdata/TDengine into develop

tests/pytest/account/account_create.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        try:
+            tdSql.execute("create account a&cc PASS 'pass123'")
+        except Exception as e:
+            print("create account a&cc PASS 'pass123'")
+            return
+
+        tdLog.exit("drop built-in user is error.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/account/account_del.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        print("==========step1")
+        print("drop built-in account")
+        try:
+            tdSql.execute("drop account root")
+        except Exception as e:
+            if len(e.args) > 0 and 'no rights' != e.args[0]:
+                tdLog.exit(e)
+
+        print("==========step2")
+        print("drop built-in user")
+        try:
+            tdSql.execute("drop user root")
+        except Exception as e:
+            if len(e.args) > 0 and 'no rights' != e.args[0]:
+                tdLog.exit(e)
+            return
+
+        tdLog.exit("drop built-in user is error.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/fulltest.sh

@@ -81,3 +81,7 @@ python3 ./test.py $1 -f import_merge/importToCommit.py
 python3 ./test.py $1 -f import_merge/importTORestart.py
 python3 ./test.py $1 -f import_merge/importTPORestart.py
 python3 ./test.py $1 -f import_merge/importTRestart.py
+
+# user
+python3 ./test.py $1 -f user/user_create.py
+python3 ./test.py $1 -f user/pass_len.py
\ No newline at end of file

tests/pytest/user/pass_len.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        print("==============step1")
+        try:
+            tdSql.execute("create user abc pass '123456'")
+        except Exception as e:
+            tdLog.exit(e)
+        print("create user abc pass '123456'")
+
+        print("==============step2")
+        try:
+            tdSql.execute("alter user abc pass 'taosdata'")
+        except Exception as e:
+            tdLog.exit(e)
+        print("alter user abc pass 'taosdata'")
+
+        print("==============step3")
+        try:
+            tdSql.execute("alter user abc pass ''")
+        except Exception as e:
+            print("alter user abc pass ''")
+        else:
+            tdLog.exit("Error: alert user abc pass''")
+
+        print("==============step4")
+        try:
+            tdSql.execute("alter user abc pass null")
+        except Exception as e:
+            print("alter user abc pass null")
+        else:
+            tdLog.exit("Error: alter user abc pass null")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/user/user_create.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        print("==============step1")
+        try:
+            tdSql.execute("create user &abc PASS 'pass123'")
+        except Exception as e:
+            print(e)
+
+        print("==============step2")
+        try:
+            tdSql.execute("create user a&bc PASS 'pass123'")
+        except Exception as e:
+            print(e)
+
+        print("==============step3")
+        try:
+            tdSql.execute("create user '涛思' PASS 'pass123'")
+        except Exception as e:
+            print(e)
+            return
+
+        tdLog.exit("create user with special character.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())