From f8261494e049229554f73a423d3a0806ee716ed7 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 30 Sep 2013 17:17:11 +0000 Subject: [PATCH] just kill python instead of trying to shut it down gracefully, in tests --- test/setup_transfer.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/setup_transfer.cpp b/test/setup_transfer.cpp index af0bc714f..768012692 100644 --- a/test/setup_transfer.cpp +++ b/test/setup_transfer.cpp @@ -388,15 +388,11 @@ void stop_all_proxies() { #ifdef _WIN32 HANDLE proc = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE, FALSE, i->second.pid); - GenerateConsoleCtrlEvent(CTRL_C_EVENT, i->second.pid); - int ret = WaitForSingleObject(proc, 1000); - // if the process didn't terminate in 1 second, kill it - if (ret != WAIT_OBJECT_0) - TerminateProcess(proc, 138); + TerminateProcess(proc, 138); CloseHandle(proc); #else printf("killing pid: %d\n", i->second.pid); - kill(i->second.pid, SIGINT); + kill(i->second.pid, SIGKILL); #endif running_proxies.erase(i->second.pid); }