Merge lp:~cmiller/apt-zeroconf/test-port-morerandom into lp:apt-zeroconf

[Chad Miller]

Unmerged revisions

134. By Chad Miller on 2011-10-31

Begin to abandon the silly nonrandom random "port" in tests.

=== modified file 'test/common.py'
--- test/common.py	2011-09-25 23:57:42 +0000
+++ test/common.py	2011-11-02 20:13:25 +0000
@@ -56,20 +56,25 @@
 
 class http_server(object):
     """
-    Context manager running a http server on the specified port,
-    serving files from below the current directory.
+    Context manager running a http server on a random port that is discoverable
+    as "port" attribute, serving files from below the current directory.
     """
 
-    def __init__(self, port):
-        self.port = port
+    def __init__(self):
+        pass
 
     def __enter__(self):
-        self.server = HTTPServer(('', self.port), SimpleHTTPRequestHandler)
+        self.server = HTTPServer(('', 0), SimpleHTTPRequestHandler)
         Thread(target=self.server.serve_forever).start()
+        return self
 
     def __exit__(self, *args, **kw):
         self.server.shutdown()
 
+    @property
+    def port(self):
+        return self.server.server_port
+
 
 class azc_server(object):
 
 
=== modified file 'test/test_general.py'
--- test/test_general.py	2011-09-25 23:59:52 +0000
+++ test/test_general.py	2011-11-02 20:13:25 +0000
@@ -167,9 +167,9 @@
 
     with azc_server(tmpdir, cachedir, PORT,
      {('apt-zeroconf', 'restrict'): 'off'}):
-        with http_server(PORT + 1):
+        with http_server() as s:
             data = urlopen('http://localhost:%i/http://localhost:%i/%s'
-                % (PORT, PORT + 1, 'somefile.gpg')).read()
+                % (PORT, s.port, 'somefile.gpg')).read()
     # make sure the data is equal
     assert data == '*contents*'
 
@@ -190,11 +190,11 @@
 
     with azc_server(tmpdir, cachedir, PORT,
     {('apt-zeroconf', 'restrict'): 'off'}):
-        with http_server(PORT + 1):
+        with http_server() as s:
             conn = HTTPConnection('localhost', PORT)
             conn.connect()
             conn.request('GET',
-                'http://localhost:%i/%s' % (PORT + 1, 'somefile.gpg'),
+                'http://localhost:%i/%s' % (s.port, 'somefile.gpg'),
                 headers={'User-Agent': 'python/httplib'})
             response = conn.getresponse()
             data = response.read()