Merge pull request prometheus#50 from andersschuller/test-fixes

brian-brazil · brian-brazil · commit 91a928b50cff · 2015-10-02T12:44:16.000+01:00
Several small test fixes
diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py
@@ -126,5 +126,5 @@ def _use_gateway(method, gateway, job, registry, grouping_key, timeout):
 def instance_ip_grouping_key():
     '''Grouping key with instance set to the IP Address of this host.'''
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    s.connect(('', 0))
+    s.connect(('localhost', 0))
     return {'instance': s.getsockname()[0]}
diff --git a/tests/graphite_bridge.py b/tests/graphite_bridge.py
@@ -28,7 +28,9 @@ def run(self):
         self.t = ServingThread()
         self.t.start()
         
-        self.gb = GraphiteBridge(server.server_address, self.registry, _time=FakeTime())
+        # Explicitly use localhost as the target host, since connecting to 0.0.0.0 fails on Windows
+        address = ('localhost', server.server_address[1])
+        self.gb = GraphiteBridge(address, self.registry, _time=FakeTime())
 
     def test_nolabels(self):
         counter = Counter('c', 'help', registry=self.registry)
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -408,15 +408,16 @@ def setUp(self):
         self.requests = requests = []
         class TestHandler(BaseHTTPRequestHandler):
             def do_PUT(self):
-                self.send_response(201)
                 length = int(self.headers['content-length'])
                 requests.append((self, self.rfile.read(length)))
+                self.send_response(201)
+                self.end_headers()
 
             do_POST = do_PUT
             do_DELETE = do_PUT
 
         httpd = HTTPServer(('', 0), TestHandler)
-        self.address = ':'.join([str(x) for x in httpd.server_address])
+        self.address = 'localhost:' + str(httpd.server_address[1])
         class TestServer(threading.Thread):
             def run(self):
                 httpd.handle_request()
@@ -466,7 +467,7 @@ def test_delete(self):
         self.assertEqual(self.requests[0][0].headers.get('content-type'), CONTENT_TYPE_LATEST)
         self.assertEqual(self.requests[0][1], b'')
 
-    def test_pushadd_with_groupingkey(self):
+    def test_delete_with_groupingkey(self):
         delete_from_gateway(self.address, "my_job", {'a': 9})
         self.assertEqual(self.requests[0][0].command, 'DELETE')
         self.assertEqual(self.requests[0][0].path, '/job/my_job/a/9')
