Merge lp:~cmiller/apt-zeroconf/fix-test-failures into lp:apt-zeroconf

[Chad Miller]

Tests stopped working in recent Ubuntu or Python versions. Fixed a few style problems that automated tools complained about.

[Martin Owens (doctormo)]

The patch/diff looks good and the test changes are awesome. Should be merged.

review: Approve (code)

=== modified file 'aptzeroconf/http.py'
--- aptzeroconf/http.py	2009-09-12 02:04:35 +0000
+++ aptzeroconf/http.py	2011-09-26 00:07:25 +0000
@@ -145,7 +145,7 @@
     @trap_socketerror
     def do_GET(self):
         self._do_GET()
-    
+
     def _do_GET(self):
         """
         Respond to a GET request by proxy the url to preferably local content,
 
=== modified file 'aptzeroconf/parse.py'
--- aptzeroconf/parse.py	2009-08-09 02:39:51 +0000
+++ aptzeroconf/parse.py	2011-09-26 00:07:25 +0000
@@ -28,14 +28,16 @@
 
 V2, V3 = 0.2, 0.3
 EPOCH_PATTERN = {
-    V2 : re.compile(r'\_\d+\%3a'),
-    V3 : re.compile(r'\_\d+\:')
+    V2: re.compile(r'\_\d+\%3a'),
+    V3: re.compile(r'\_\d+\:'),
 }
 
+
 def normalize_whitespace(text):
     """Remove excessive whitespace in spaces."""
     return ' '.join(text.split())
 
+
 def _is_equal(pkg, find, ver):
     """Are the packages equal disregarding the epoch?"""
     return EPOCH_PATTERN[ver].sub('_', pkg) == find or pkg == find
 
=== modified file 'test/common.py'
--- test/common.py	2009-08-09 03:30:29 +0000
+++ test/common.py	2011-09-26 00:07:25 +0000
@@ -36,11 +36,11 @@
 ROOT = str(rootdir)
 
 DEBNAME = 'test_1.deb'
-DEBEPOCHNAME = 'test_1%3a1.deb'
+DEBEPOCHNAME = 'test_1%3A1.deb'
 
 DEBPROXYURL = (
-    'archive.ubuntu.com/ubuntu/pool/main/h/hello/hello_2.2-3_i386.deb')
-DEBFORWARDURL = 'ubuntu/pool/main/h/hello/hello_2.2-3_i386.deb'
+    'archive.ubuntu.com/ubuntu/pool/main/h/hello/hello_2.7-1_i386.deb')
+DEBFORWARDURL = 'ubuntu/pool/main/h/hello/hello_2.7-1_i386.deb'
 
 PORT = 4796 # random port that probably wont be in use
 
 
=== modified file 'test/test_general.py'
--- test/test_general.py	2009-08-09 03:57:29 +0000
+++ test/test_general.py	2011-09-26 00:07:25 +0000
@@ -72,16 +72,16 @@
     touch(path.join(cachedir, DEBNAME), '*contents*')
 
     with azc_server(str(tmpdir), cachedir, PORT,
-     {('apt-cache', 'test'): 'http://example.com'}) as server:
-        data = urlopen('http://localhost:%i/http://example.com/%s' % (
+     {('apt-cache', 'test'): 'http://notexist.example.com'}) as server:
+        data = urlopen('http://localhost:%i/http://notexist.example.com/%s' % (
             PORT, DEBNAME)).read()
         # make sure the data is equal
         assert data == '*contents*'
 
 
-def test_download_one_epoch_deb(tmpdir):
+def test_download_one_versionepoch_deb(tmpdir):
     """
-    Test downloading a deb with an epoch from the local cache.
+    Test downloading a deb with a version epoch from the local cache.
     """
     # cachedir is the directory to serve debs out of
     cachedir = path.join(str(tmpdir), 'debs')
@@ -89,8 +89,8 @@
     touch(path.join(cachedir, DEBEPOCHNAME), '*contents*')
 
     with azc_server(str(tmpdir), cachedir, PORT,
-     {('apt-cache', 'test'): 'http://example.com'}) as server:
-        data = urlopen('http://localhost:%i/http://example.com/%s' % (
+     {('apt-cache', 'test'): 'http://notexist.example.com'}) as server:
+        data = urlopen('http://localhost:%i/http://notexist.example.com/%s' % (
             PORT, DEBEPOCHNAME)).read()
         # make sure the data is equal
         assert data == '*contents*'
@@ -118,15 +118,17 @@
     with azc_server(one, cacheone, PORT, one_config):
         with azc_server(two, cachetwo, PORT+1, two_config):
             time.sleep(3.0) # wait for one to discover two
-            data = urlopen('http://localhost:%i/http://example.com/%s' % (
-                PORT, DEBNAME)).read()
+            data = urlopen(
+                'http://localhost:%i/http://notexist.example.com/%s' % (
+                    PORT, DEBNAME)).read()
     # make sure the data is equal
     assert data == '*contents*'
 
 
-def test_download_epoch_local_server(tmpdir):
+def test_download_versionepoch_local_server(tmpdir):
     """
-    Test fetching a file with an epoch from an AZC instance on the local network.
+    Test fetching a file with an epoch from an AZC instance on the local
+    network.
     """
     # cachedir is the directory to serve debs out of
     one = path.join(str(tmpdir), 'one')
@@ -146,8 +148,9 @@
     with azc_server(one, cacheone, PORT, one_config):
         with azc_server(two, cachetwo, PORT+1, two_config):
             time.sleep(3.0) # wait for one to discover two
-            data = urlopen('http://localhost:%i/http://example.com/%s' % (
-                PORT, DEBNAME)).read()
+            data = urlopen(
+                'http://localhost:%i/http://notexist.example.com/%s' % (
+                    PORT, DEBNAME)).read()
     # make sure the data is equal
     assert data == '*contents*'