Merge pull request #158 from ddspog/development

dbtest: Use os.Kill on Windows instead of os.Interrupt

dbtest/dbserver.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"runtime"
 	"strconv"
 	"time"
 
@@ -70,7 +71,7 @@ func (dbs *DBServer) start() {
 	err = dbs.server.Start()
 	if err != nil {
 		// print error to facilitate troubleshooting as the panic will be caught in a panic handler
-		fmt.Fprintf(os.Stderr, "mongod failed to start: %v\n",err)
+		fmt.Fprintf(os.Stderr, "mongod failed to start: %v\n", err)
 		panic(err)
 	}
 	dbs.tomb.Go(dbs.monitor)
@@ -113,7 +114,12 @@ func (dbs *DBServer) Stop() {
 	}
 	if dbs.server != nil {
 		dbs.tomb.Kill(nil)
-		dbs.server.Process.Signal(os.Interrupt)
+		// Windows doesn't support Interrupt
+		if runtime.GOOS == "windows" {
+			dbs.server.Process.Signal(os.Kill)
+		} else {
+			dbs.server.Process.Signal(os.Interrupt)
+		}
 		select {
 		case <-dbs.tomb.Dead():
 		case <-time.After(5 * time.Second):