Merge lp:~jameinel/gouda/win-fixes into lp:gouda

[John A Meinel]

Just some simple cleanups I did while testing on Windows.

Nice to have things work in both places, and the changes are general cleanliness improvements anyway. (No reason to leave zombie processes lying around.)

Unmerged revisions

28. By John A Meinel on 2012-10-31

Several fixes on Windows.

Bind to localhost:0, otherwise it binds to all interfaces, which we don't
really want.
Wait() for the child process to exit after sending the shutdown request.
Some small bits of code cleanup.

=== modified file 'test_serv/gouda_serv.py'
--- test_serv/gouda_serv.py	2012-10-30 16:11:48 +0000
+++ test_serv/gouda_serv.py	2012-10-31 20:28:47 +0000
@@ -21,7 +21,6 @@
 import re
 import subprocess
 import socket
-import sys
 import tempfile
 from testtools.content import content_from_file
 
@@ -58,7 +57,6 @@
             hostname = v4
         port = int(port)
         self.child_address = (hostname, port)
-        # sys.stderr.write('Connecting to: %s\n' % (self.child_address,))
         self.child_conn = socket.create_connection(self.child_address)
         self.addCleanup(self._shutdown)
 
@@ -69,7 +67,6 @@
         request_str = json.dumps(request_dict)
         self.child_conn.sendall(request_str)
         response_str = self.child_conn.recv(1024)
-        # sys.stderr.write('Response str: %r\n' % (response_str,))
         response = json.loads(response_str)
         assert response['id'] == self.counter
         if response['error'] is not None:
@@ -84,6 +81,7 @@
     def _shutdown(self):
         self._send_msg('DBService.Shutdown')
         self.child_conn.close()
+        self.child.wait()
 
 
 GoudaTestService = GoudaTestServiceFixture()

=== modified file 'test_serv/service.go'
--- test_serv/service.go	2012-10-30 16:11:48 +0000
+++ test_serv/service.go	2012-10-31 20:28:47 +0000
@@ -34,7 +34,7 @@
 func NewDBService(conn net.Listener) (*DBService, error) {
 	var err error
 	if conn == nil {
-		conn, err = net.Listen("tcp", ":0")
+		conn, err = net.Listen("tcp", "localhost:0")
 		if err != nil {
 			return nil, err
 		}

=== modified file 'test_serv/test_gouda_serv.py'
--- test_serv/test_gouda_serv.py	2012-10-30 16:11:48 +0000
+++ test_serv/test_gouda_serv.py	2012-10-31 20:28:47 +0000
@@ -18,7 +18,6 @@
 import fixtures
 import json
 from testtools import TestCase
-from testtools.content import text_content
 
 import gouda_serv