Merge lp:~jtv/maas/import-boot-images-with-mandatory-sources into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Prepare tests for import_boot_images task taking a mandatory sources argument. Extracted from larger branch to reduce review size.

=== modified file 'src/provisioningserver/import_images/boot_resources.py'
--- src/provisioningserver/import_images/boot_resources.py	2014-05-26 13:19:43 +0000
+++ src/provisioningserver/import_images/boot_resources.py	2014-05-26 16:07:20 +0000
@@ -33,6 +33,7 @@
     download_all_boot_resources,
     )
 from provisioningserver.import_images.helpers import logger
+from provisioningserver.import_images.keyrings import write_all_keyrings
 from provisioningserver.import_images.product_mapping import map_products
 from provisioningserver.utils import (
     atomic_write,
@@ -40,7 +41,6 @@
     locate_config,
     read_text_file,
     )
-from provisioningserver.import_images.keyrings import write_all_keyrings
 
 
 class NoConfigFile(Exception):

=== modified file 'src/provisioningserver/import_images/keyrings.py'
--- src/provisioningserver/import_images/keyrings.py	2014-05-23 09:48:49 +0000
+++ src/provisioningserver/import_images/keyrings.py	2014-05-26 16:07:20 +0000
@@ -13,13 +13,12 @@
 __metaclass__ = type
 __all__ = []
 
+from base64 import b64decode
 import os
 import tempfile
 from urlparse import urlsplit
-from base64 import b64decode
-from provisioningserver.import_images.helpers import (
-    logger,
-    )
+
+from provisioningserver.import_images.helpers import logger
 
 
 def write_keyring(keyring_path, keyring_data):

=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
--- src/provisioningserver/import_images/tests/test_boot_resources.py	2014-05-23 13:35:27 +0000
+++ src/provisioningserver/import_images/tests/test_boot_resources.py	2014-05-26 16:07:20 +0000
@@ -25,7 +25,10 @@
     )
 
 from maastesting.factory import factory
-from maastesting.matchers import MockAnyCall, MockCalledWith
+from maastesting.matchers import (
+    MockAnyCall,
+    MockCalledWith,
+    )
 from maastesting.testcase import MAASTestCase
 import mock
 import provisioningserver

=== modified file 'src/provisioningserver/import_images/tests/test_download_resources.py'
--- src/provisioningserver/import_images/tests/test_download_resources.py	2014-05-23 09:48:49 +0000
+++ src/provisioningserver/import_images/tests/test_download_resources.py	2014-05-26 16:07:20 +0000
@@ -14,14 +14,15 @@
 __metaclass__ = type
 __all__ = []
 
+from datetime import datetime
 import os
-from datetime import datetime
+
+from maastesting.matchers import MockCalledWith
 from maastesting.testcase import MAASTestCase
+import mock
 from provisioningserver.import_images import download_resources
 from provisioningserver.import_images.product_mapping import ProductMapping
-from maastesting.matchers import MockCalledWith
 from simplestreams.objectstores import FileStore
-import mock
 
 
 class MockDateTime(mock.MagicMock):

=== modified file 'src/provisioningserver/import_images/tests/test_keyrings.py'
--- src/provisioningserver/import_images/tests/test_keyrings.py	2014-05-23 10:01:31 +0000
+++ src/provisioningserver/import_images/tests/test_keyrings.py	2014-05-26 16:07:20 +0000
@@ -13,11 +13,15 @@
 __metaclass__ = type
 __all__ = []
 
+from base64 import b64encode
 import os
+
+from maastesting.matchers import (
+    MockCalledWith,
+    MockCallsMatch,
+    )
+from maastesting.testcase import MAASTestCase
 import mock
-from base64 import b64encode
-from maastesting.testcase import MAASTestCase
-from maastesting.matchers import MockCallsMatch, MockCalledWith
 from provisioningserver.import_images import keyrings
 from testtools.matchers import FileContains
 

=== modified file 'src/provisioningserver/tests/test_tasks.py'
--- src/provisioningserver/tests/test_tasks.py	2014-05-26 13:19:43 +0000
+++ src/provisioningserver/tests/test_tasks.py	2014-05-26 16:07:20 +0000
@@ -646,21 +646,21 @@
         self.patch(boot_resources, 'logger')
         self.patch(boot_resources, 'locate_config').return_value = (
             fixture.filename)
-        import_boot_images()
+        import_boot_images(sources=[])
         self.assertIsInstance(import_boot_images, Task)
 
     def test_import_boot_images_sets_GPGHOME(self):
         home = factory.make_name('home')
         self.patch(tasks, 'MAAS_USER_GPGHOME', home)
         fake = self.patch_boot_resources_function()
-        import_boot_images()
+        import_boot_images(sources=[])
         self.assertEqual(home, fake.env['GNUPGHOME'])
 
     def test_import_boot_images_sets_proxy_if_given(self):
         proxy = 'http://%s.example.com' % factory.make_name('proxy')
         proxy_vars = ['http_proxy', 'https_proxy']
         fake = self.patch_boot_resources_function()
-        import_boot_images(http_proxy=proxy)
+        import_boot_images(sources=[], http_proxy=proxy)
         self.assertEqual(
             {
                 var: proxy
@@ -670,13 +670,13 @@
     def test_import_boot_images_leaves_proxy_unchanged_if_not_given(self):
         proxy_vars = ['http_proxy', 'https_proxy']
         fake = self.patch_boot_resources_function()
-        import_boot_images()
+        import_boot_images(sources=[])
         self.assertEqual({}, utils.filter_dict(fake.env, proxy_vars))
 
     def test_import_boot_images_calls_callback(self):
         self.patch_boot_resources_function()
         mock_callback = Mock()
-        import_boot_images(callback=mock_callback)
+        import_boot_images(sources=[], callback=mock_callback)
         self.assertThat(mock_callback.delay, MockCalledOnceWith())
 
     def test_import_boot_images_accepts_sources_parameter(self):