diff --git a/.travis.yml b/.travis.yml
index db6ce79703bab01e55227ad11a73395883a0ba1f..39fddc20c9f1c5c2b1369f248a3859c2bf6165cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ matrix:
           memError=`grep -m 1 'ERROR SUMMARY' mem-error-out.txt | awk '{print $4}'`
 
           if [ -n "$memError" ]; then
-            if [ "$memError" -gt 16 ] && [ "$defiMemError" -gt 0 ]; then
+            if [ "$memError" -gt 16 ] || [ "$defiMemError" -gt 0 ]; then
               echo -e "${RED} ## Memory errors number valgrind reports is $memError.\
                        Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
               travis_terminate $memError
diff --git a/tests/pytest/insert/float.py b/tests/pytest/insert/float.py
new file mode 100644
index 0000000000000000000000000000000000000000..7c4474f7ad0be25da8ec0622061654ea620e0219
--- /dev/null
+++ b/tests/pytest/insert/float.py
@@ -0,0 +1,147 @@
+###################################################################
+#           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 datetime
+
+import taos
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        cmd = 'create table tb (ts timestamp, speed float)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = 'insert into tb values (now, -3.40E+38)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+
+        tdLog.info("=============== step2")
+        cmd = 'insert into tb values (now+1a, 3.40E+308)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = 'select * from tb order by ts desc'
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        tdSql.checkRows(1)
+
+        tdLog.info("=============== step3")
+        cmd = "insert into tb values (now+2a, 2.85)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        ret = tdSql.query(cmd)
+        tdSql.checkRows(2)
+
+        if ((abs(tdSql.getData(0, 1) - 2.850000)) > 1.0e-7):
+            tdLog.exit("data is not 2.850000")
+
+        tdLog.info("=============== step4")
+        cmd = "insert into tb values (now+3a, 3.4)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        tdSql.checkRows(3)
+        if (abs(tdSql.getData(0, 1) - 3.400000) > 1.0e-7):
+            tdLog.exit("data is not 3.400000")
+
+        tdLog.info("=============== step5")
+        cmd = "insert into tb values (now+4a, a2)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit("This test failed: \
+                       insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = "insert into tb values (now+4a, 0)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        tdSql.checkRows(4)
+        if (abs(tdSql.getData(0, 1) - 0.000000) != 0):
+            tdLog.exit("data is not 0.000000")
+
+        tdLog.info("=============== step6")
+        cmd = "insert into tb values (now+5a, 2a)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = "insert into tb values (now+5a, 2)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        ret = tdSql.query(cmd)
+        tdSql.checkRows(5)
+        if (abs(tdSql.getData(0, 1) - 2.000000) > 1.0e-7):
+            tdLog.info("data is not 2.000000")
+
+        tdLog.info("=============== step7")
+        cmd = "insert into tb values (now+6a, 2a'1)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = "insert into tb values (now+6a, 2)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        if (abs(tdSql.getData(0, 1) - 2.000000) > 1.0e-7):
+            tdLog.exit("data is not 2.000000")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/int.py b/tests/pytest/insert/int.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d38337576ccb78bd22155697b5d19c3655c11a1
--- /dev/null
+++ b/tests/pytest/insert/int.py
@@ -0,0 +1,184 @@
+###################################################################
+#           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
+import datetime
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        tdSql.execute('create table tb (ts timestamp, speed int)')
+
+        cmd = 'insert into tb values (now, NULL)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(1)
+        if(tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not NULL")
+
+        tdLog.info("=============== step2")
+        cmd = 'insert into tb values (now+1m, -2147483648)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: INT data overflow error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("INT data overflow error catched")
+
+        cmd = 'insert into tb values (now+1m, NULL)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(2)
+
+        if(tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not NULL")
+
+        tdLog.info("=============== step3")
+        cmd = 'insert into tb values (now+2m, 2147483647)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(3)
+        if(tdSql.getData(0, 1) != 2147483647):
+            tdLog.exit("data is not 2147483647")
+
+        tdLog.info("=============== step4")
+        cmd = 'insert into tb values (now+3m, 2147483648)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: INT data overflow error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("INT data overflow error catched")
+
+        cmd = 'insert into tb values (now+3m, NULL)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(4)
+
+        if(tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not NULL")
+
+        tdLog.info("=============== step5")
+        cmd = 'insert into tb values (now+4m, a2)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = 'insert into tb values (now+4m, 0)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(5)
+
+        if(tdSql.getData(0, 1) != 0):
+            tdLog.exit("data is not 0")
+
+        tdLog.info("=============== step6")
+        cmd = 'insert into tb values (now+5m, 2a)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = 'insert into tb values (now+5m, 2)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(6)
+        if (tdSql.getData(0, 1) != 2):
+            tdLog.exit("data is not 2")
+
+        tdLog.info("=============== step7")
+        cmd = "insert into tb values (now+6m, 2a'1)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.notice("insert wrong data error catched")
+
+        cmd = 'insert into tb values (now+6m, 2)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(7)
+        if (tdSql.getData(0, 1) != 2):
+            tdLog.exit("data is not 2")
+
+        tdLog.info("=============== step8")
+        cmd = 'insert into tb values (now+8m, "null")'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(8)
+
+        if (tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not null")
+
+        tdLog.info("=============== step9")
+        cmd = "insert into tb values (now+9m, 'null')"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(9)
+        if (tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not null")
+
+        tdLog.info("=============== step10")
+        cmd = 'insert into tb values (now+10m, -123)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(10)
+
+        if (tdSql.getData(0, 1) != -123):
+            tdLog.exit("data is not -123")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/test.py b/tests/pytest/test.py
index ae82ed045c61d1ce0e6364d35924681b5915083a..479406a00b728c1ea7cbb28255db2e6db11166b2 100644
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
@@ -105,10 +105,7 @@ if __name__ == "__main__":
             if fileName == "all":
                 tdCases.runAllLinux(conn)
             else:
-                try:
-                    tdCases.runOneLinux(conn, fileName)
-                except Exception as e:
-                    tdLog.exit("failed: %s" % fileName)
+                tdCases.runOneLinux(conn, fileName)
             conn.close()
     else:
         tdLog.notice("Procedures for tdengine deployed in %s" % (masterIp))
diff --git a/tests/pytest/util/cases.py b/tests/pytest/util/cases.py
index dd1f9e1649536ebffda11f87a31e4b4573b8c14b..1771c23620dbe547733e8c2ce317bd38961a87d3 100644
--- a/tests/pytest/util/cases.py
+++ b/tests/pytest/util/cases.py
@@ -71,7 +71,7 @@ class TDCases:
                     case.run()
                 except Exception as e:
                     tdLog.notice(repr(e))
-                    tdLog.exit("failed: %s" % fileName)
+                    tdLog.notice("%s failed: %s" % (__file__, fileName))
                 case.stop()
                 runNum += 1
                 continue
diff --git a/tests/test-all.sh b/tests/test-all.sh
index dee89b9dc57da7e6a8292ee0aca82b329b8865f2..6943dd47a780c1de5cf431e9f45789af19412c09 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -25,15 +25,17 @@ if [ "$totalFailed" -ne "0" ]; then
 fi
 
 cd ../pytest
-./simpletest.sh 2>&1 | grep 'successfully executed\|failed' | tee pytest-out.txt
+./simpletest.sh 2>&1 | tee pytest-out.txt
 totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l`
 
 if [ "$totalPySuccess" -gt "0" ]; then
+  grep 'successfully executed' pytest-out.txt
   echo -e "${GREEN} ### Total $totalPySuccess python case(s) succeed! ### ${NC}"
 fi
 
-totalPyFailed=`grep 'failed' pytest-out.txt | wc -l`
+totalPyFailed=`grep 'failed\|fault' pytest-out.txt | wc -l`
 if [ "$totalPyFailed" -ne "0" ]; then
+  cat pytest-out.txt
   echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}"
   exit $totalPyFailed
 fi