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

Merge remote-tracking branch 'origin/develop' into feature/os

This commit is contained in:
Shengliang Guan 2020-07-31 03:07:51 +00:00
parent 84564fe078 f5e6f0d7ff
commit ee429df86b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wal/CMakeLists.txt
View File

@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC)
ADD_LIBRARY(twal ${SRC}) ADD_LIBRARY(twal ${SRC})
TARGET_LINK_LIBRARIES(twal common osdetail tutil) TARGET_LINK_LIBRARIES(twal tutil common)
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)

2
tests/pytest/stable/query_after_reset.py
View File

@ -76,7 +76,7 @@ class Test:
tdSql.query("select * from st") tdSql.query("select * from st")
except Exception as e: except Exception as e:
tdLog.info("Exception catched: %s" % repr(e)) tdLog.info("Exception catched: %s" % repr(e))
if ('mnode invalid table name' not in repr(e)): if ('Table does not exist' not in repr(e)):
raise Exception(repr(e)) raise Exception(repr(e))
def create_stable(self): def create_stable(self):