diff --git a/Jenkinsfile b/Jenkinsfile
index 24955aa8e7a70176b5a6dfd02e30905b58a1c140..56227bf0dda449a279a7e5ad6ed2cd619c9bb450 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -114,6 +114,7 @@ def pre_test(){
 }
 def pre_test_win(){
     bat '''
+    taskkill /f /t /im python.exe
     cd C:\\
     rd /s /Q C:\\TDengine
     cd C:\\workspace\\TDinternal
@@ -179,9 +180,9 @@ def pre_test_win(){
     mkdir debug
     cd debug
     call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
-    cmake ../ -G "NMake Makefiles" && exit 8
-    nmake && exit 8
-    nmake install && exit 8
+    cmake ../ -G "NMake Makefiles" 
+    nmake || exit 8
+    nmake install || exit 8
     xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 && exit 8
     cd C:\\workspace\\TDinternal\\community\\src\\connector\\python
     python -m pip install .
@@ -484,10 +485,12 @@ pipeline {
             
             catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                 pre_test_win()
+                timeout(time: 20, unit: 'MINUTES'){
                 bat'''
                 cd C:\\workspace\\TDinternal\\community\\tests\\pytest
                 .\\test-all.bat Wintest
                 '''
+                }
             }     
             script{
               win_stop=1