From dff5c11f290453a349bdb885e00128586700bece Mon Sep 17 00:00:00 2001
From: wu champion <wuchampion@foxmail.com>
Date: Sat, 20 Mar 2021 16:10:45 +0800
Subject: [PATCH] [test]<fix> add test case and bug case

---
 tests/pytest/fulltest.sh               |  4 ++
 tests/pytest/query/bug3351.py          | 74 ++++++++++++++++++++++++++
 tests/pytest/query/query1970YearsAf.py |  4 +-
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 tests/pytest/query/bug3351.py

diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 5037f2c399..aa8e679e81 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -196,6 +196,10 @@ python3 ./test.py -f query/bug2119.py
 python3 ./test.py -f query/isNullTest.py
 python3 ./test.py -f query/queryWithTaosdKilled.py
 python3 ./test.py -f query/floatCompare.py
+python3 ./test.py -f query/query1970YearsAf.py
+python3 ./test.py -f query/bug3351.py
+
+
 
 #stream
 python3 ./test.py -f stream/metric_1.py
diff --git a/tests/pytest/query/bug3351.py b/tests/pytest/query/bug3351.py
new file mode 100644
index 0000000000..288d071a69
--- /dev/null
+++ b/tests/pytest/query/bug3351.py
@@ -0,0 +1,74 @@
+###################################################################
+#           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
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 36500")
+        tdSql.execute("use db")
+        tdLog.printNoPrefix("==========step1:create table && insert data")
+
+        tdSql.execute(
+            "create table stb1 (ts timestamp, c1 int) TAGS(t1 int)"
+        )
+        tdSql.execute("create table t0 using stb1 tags(1)")
+        tdSql.execute("insert into t0 values (-865000000, 1)")
+        tdSql.execute("insert into t0 values (-864000000, 2)")
+        tdSql.execute("insert into t0 values (-863000000, 3)")
+        tdSql.execute("insert into t0 values (-15230000, 4)")
+        tdSql.execute("insert into t0 values (-15220000, 5)")
+        tdSql.execute("insert into t0 values (-15210000, 6)")
+
+        tdLog.printNoPrefix("==========step2:query")
+        # bug1:when ts > -864000000, return 0 rows;
+        # bug2:when ts = -15220000, return 0 rows.
+        tdSql.query('select * from t0 where ts < -864000000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts <= -864000000')
+        tdSql.checkRows(2)
+        tdSql.query('select * from t0 where ts = -864000000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts > -864000000')
+        tdSql.checkRows(4)
+        tdSql.query('select * from t0 where ts >= -864000000')
+        tdSql.checkRows(5)
+        tdSql.query('select * from t0 where ts < -15220000')
+        tdSql.checkRows(4)
+        tdSql.query('select * from t0 where ts <= -15220000')
+        tdSql.checkRows(5)
+        tdSql.query('select * from t0 where ts = -15220000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts > -15220000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts >= -15220000')
+        tdSql.checkRows(2)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/pytest/query/query1970YearsAf.py b/tests/pytest/query/query1970YearsAf.py
index 9902f6908b..d2eead241f 100644
--- a/tests/pytest/query/query1970YearsAf.py
+++ b/tests/pytest/query/query1970YearsAf.py
@@ -88,7 +88,7 @@ class TDTestCase:
             "disorder_ratio": 0,
             "disorder_range": 1000,
             "timestamp_step": 20000,
-            "start_timestamp": "1969-12-31 00:00:00.000",
+            "start_timestamp": "1969-12-30 23:59:40.000",
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
@@ -153,7 +153,7 @@ class TDTestCase:
         return file_create_table
 
     def inserttable(self, filepath):
-        create_table_cmd = f"taosdemo -f {filepath}  > /tmp/1.log 2>&1"
+        create_table_cmd = f"taosdemo -f {filepath}  > /dev/null 2>&1"
         _ = subprocess.check_output(create_table_cmd, shell=True).decode("utf-8")
 
     def sqlsquery(self):
-- 
GitLab