Merge lp:~arges/charm-helpers/fix-lp1308557 into lp:charm-helpers

[Chris J Arges]

[Edward Hope-Morley (hopem)]

Chris this LTGM. Please confirm that is has bee tested. I see that you have synced this into a couple of charms so if they work fine then we can ship this.

[Jorge Niedbalski (niedbalski)]

OK, all tests are passing.

---------------------------------------------------------------------------
TOTAL 2917 220 92%
----------------------------------------------------------------------
Ran 595 tests in 2.259s

OK

PS: test_requirements are not working properly. Proposed MR on this; https://code.launchpad.net/~niedbalski/charm-helpers/fix-test_requirements/+merge/216902

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'charmhelpers/fetch/__init__.py'
--- charmhelpers/fetch/__init__.py	2014-03-20 13:26:03 +0000
+++ charmhelpers/fetch/__init__.py	2014-04-16 14:02:53 +0000
@@ -184,7 +184,7 @@
             apt.write(PROPOSED_POCKET.format(release))
     if key:
         subprocess.check_call(['apt-key', 'adv', '--keyserver',
-                               'keyserver.ubuntu.com', '--recv',
+                               'hkp://keyserver.ubuntu.com:80', '--recv',
                                key])
 
 

=== modified file 'tests/fetch/test_fetch.py'
--- tests/fetch/test_fetch.py	2014-03-26 10:26:36 +0000
+++ tests/fetch/test_fetch.py	2014-04-16 14:02:53 +0000
@@ -181,7 +181,7 @@
         fetch.add_source(source=source, key=key)
         check_call.assert_has_calls([
             call(['add-apt-repository', '--yes', source]),
-            call(['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com',
+            call(['apt-key', 'adv', '--keyserver', 'hkp://keyserver.ubuntu.com:80',
                   '--recv', key])
         ])
 
@@ -192,7 +192,7 @@
         fetch.add_source(source=source, key=key)
         check_call.assert_has_calls([
             call(['add-apt-repository', '--yes', source]),
-            call(['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com',
+            call(['apt-key', 'adv', '--keyserver', 'hkp://keyserver.ubuntu.com:80',
                   '--recv', key])
         ])