Merge lp:~jml/pkgme/run-all-info-once into lp:pkgme

[Jonathan Lange]

Only call all_info once

all_info was being called three times when packaging things for pkgme-service.

That's because PackageFiles.get_files() was using 'get_all' on the original
project_info object that it got three times. 'get_all' is a bit of a nasty
API, in that it pretty much always spawns a subprocess, unless it's a DictInfo.

The solution here is to wrap the results in a DictInfo. All the necessary
keys should be there.

I've added a test, which is a little clumsy.

cheers,
jml

[James Westby (james-w)]

review: Approve

=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-09-12 03:31:40 +0000
+++ pkgme/package_files.py	2012-09-26 15:27:20 +0000
@@ -127,11 +127,11 @@
         keys = (
             [ExtraFiles.name] + [ExtraFilesFromPaths.name]
             + [element.name for element in elements])
-        values = project_info.get_all(keys)
-        new_info = DictInfo(values)
+        # Cache the resulting info so we don't call the helpers again.
+        project_info = DictInfo(project_info.get_all(keys))
         files = []
         for file_cls in self.files_cls:
-            files.append(file_cls.from_info(new_info))
+            files.append(file_cls.from_info(project_info))
         extra_files = ExtraFiles.get_value(project_info)
         for path, contents in extra_files.items():
             files.append(BasicFile(path, contents))

=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-09-12 03:31:40 +0000
+++ pkgme/tests/test_package_files.py	2012-09-26 15:27:20 +0000
@@ -646,3 +646,24 @@
         self.assertEqual('foo.txt', foo.path)
         self.assertEqual(foo_content, foo.get_contents())
         self.assertEqual(True, foo.overwrite)
+
+    def test_get_info_once(self):
+        foo_content = self.getUniqueString()
+        tree = self.useFixture(
+            FileTree(
+                {'foo': {'content': foo_content},
+                 'bar': {}}))
+        group = PackageFileGroup()
+        project_info = DictInfo({
+            ExtraFilesFromPaths.name: {
+                'foo.txt': tree.join('foo'),
+                'debian/install': tree.join('bar'),
+                }})
+        calls = []
+        orig_get_all = project_info.get_all
+        def get_all(keys):
+            calls.append(keys)
+            return orig_get_all(keys)
+        project_info.get_all = get_all
+        group.get_files(project_info)
+        self.assertEqual(1, len(calls), calls)