Merge lp:~james-w/linaro-image-tools/obey-include-debs into lp:linaro-image-tools/11.11

[James Westby]

Hi,

Here's the followup branch that actually obeys the include-debs setting.

If we find that setting is true then we use a new method that just resolves
the versions and doesn't download the content, passing it to the same method
as before.

We tested that passing content=None FetchedPackages to that method in the
last branch, so this is just about plumbing the right bits together.

Thanks,

James

[James Westby (james-w)]

I had a good idea to make this simpler.

Thanks,

James

[lp:~james-w/linaro-image-tools/obey-include-debs]

154. By James Westby on 2010-09-14

Use a parameter rather than a separate method.

The two are so close that we don't need two methods, and can just share most
of the code.

155. By James Westby on 2010-09-14

Merged make-package-content-optional into obey-include-debs.

156. By James Westby on 2010-09-15

Merged make-package-content-optional into obey-include-debs.

157. By James Westby on 2010-09-15

Merge trunk.

Unmerged revisions

=== modified file 'hwpack/builder.py'
--- hwpack/builder.py	2010-09-03 15:14:32 +0000
+++ hwpack/builder.py	2010-09-14 02:18:48 +0000
@@ -36,7 +36,11 @@
             fetcher = PackageFetcher(
                 sources.values(), architecture=architecture)
             with fetcher:
-                packages = fetcher.fetch_packages(self.config.packages)
+                if self.config.include_debs:
+                    method = fetcher.fetch_packages
+                else:
+                    method = fetcher.get_versions
+                packages = method(self.config.packages)
                 hwpack.add_packages(packages)
                 with open(hwpack.filename(), 'w') as f:
                     hwpack.to_file(f)

=== modified file 'hwpack/packages.py'
--- hwpack/packages.py	2010-09-14 02:18:48 +0000
+++ hwpack/packages.py	2010-09-14 02:18:48 +0000
@@ -359,6 +359,21 @@
         self.cleanup()
         return False
 
+    def _get_candidates(self, packages):
+        results = []
+        for package in packages:
+            candidate = self.cache.cache[package].candidate
+            yield candidate
+
+    def get_versions(self, packages):
+        results = []
+        for candidate in self._get_candidates(packages):
+            base = os.path.basename(candidate.filename)
+            result_package = FetchedPackage.from_apt(
+                candidate, base)
+            results.append(result_package)
+        return results
+
     def fetch_packages(self, packages):
         """Fetch the files for the given list of package names.
 
@@ -371,8 +386,7 @@
             be found.
         """
         results = []
-        for package in packages:
-            candidate = self.cache.cache[package].candidate
+        for candidate in self._get_candidates(packages):
             base = os.path.basename(candidate.filename)
             destfile = os.path.join(self.cache.tempdir, base)
             acq = apt_pkg.Acquire(DummyProgress())

=== modified file 'hwpack/tests/test_builder.py'
--- hwpack/tests/test_builder.py	2010-09-02 21:31:22 +0000
+++ hwpack/tests/test_builder.py	2010-09-14 02:18:48 +0000
@@ -72,3 +72,28 @@
             IsHardwarePack(
                 metadata, [available_package],
                 {source_id: source.sources_entry}))
+
+    def test_obeys_include_debs(self):
+        hwpack_name = "ahwpack"
+        hwpack_version = "1.0"
+        architecture = "armel"
+        package_name = "foo"
+        source_id = "ubuntu"
+        available_package = DummyFetchedPackage(
+            package_name, "1.1", architecture=architecture)
+        source = self.useFixture(AptSourceFixture([available_package]))
+        config = self.useFixture(ConfigFileFixture(
+            '[hwpack]\nname=%s\npackages=%s\narchitectures=%s\n'
+            'include-debs=no\n\n[%s]\nsources-entry=%s\n'
+            % (hwpack_name, package_name, architecture,
+                source_id, source.sources_entry)))
+        builder = HardwarePackBuilder(config.filename, hwpack_version)
+        builder.build()
+        metadata = Metadata(hwpack_name, hwpack_version, architecture)
+        self.assertThat(
+            "hwpack_%s_%s_%s.tar.gz" % (hwpack_name, hwpack_version,
+                architecture),
+            IsHardwarePack(
+                metadata, [available_package],
+                {source_id: source.sources_entry},
+                packages_without_content=[available_package]))

=== modified file 'hwpack/tests/test_packages.py'
--- hwpack/tests/test_packages.py	2010-09-14 02:18:48 +0000
+++ hwpack/tests/test_packages.py	2010-09-14 02:18:48 +0000
@@ -653,3 +653,102 @@
         fetcher = self.get_fetcher([source])
         self.assertEqual(
             wanted_package, fetcher.fetch_packages(["foo"])[0])
+
+    def test_get_versions_not_found_because_no_sources(self):
+        fetcher = self.get_fetcher([])
+        self.assertRaises(KeyError, fetcher.get_versions, ["nothere"])
+
+    def test_get_versions_not_found_because_not_in_sources(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        self.assertRaises(KeyError, fetcher.get_versions, ["nothere"])
+
+    def test_get_versions_not_found_one_of_two_missing(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        self.assertRaises(
+            KeyError, fetcher.get_versions, ["foo", "nothere"])
+
+    def test_get_versions_fetches_no_packages(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        self.assertEqual(0, len(fetcher.get_versions([])))
+
+    def test_get_versions_fetches_single_package(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        self.assertEqual(1, len(fetcher.get_versions(["foo"])))
+
+    def test_get_versions_fetches_correct_package(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        package_info = fetcher.get_versions(["foo"])[0]
+        self.assertEqual(available_package.name, package_info.name)
+        self.assertEqual(available_package.version, package_info.version)
+
+    def test_get_versions_fetches_multiple_packages(self):
+        available_packages = [
+            DummyFetchedPackage("bar", "1.0"),
+            DummyFetchedPackage("foo", "1.0"),
+        ]
+        source = self.useFixture(AptSourceFixture(available_packages))
+        fetcher = self.get_fetcher([source])
+        self.assertEqual(2, len(fetcher.get_versions(["foo", "bar"])))
+
+    def test_get_versions_fetches_multiple_packages_correctly(self):
+        available_packages = [
+            DummyFetchedPackage("foo", "1.0"),
+            DummyFetchedPackage("bar", "1.0"),
+        ]
+        source = self.useFixture(AptSourceFixture(available_packages))
+        fetcher = self.get_fetcher([source])
+        fetched = fetcher.get_versions(["foo", "bar"])
+        self.assertEqual(available_packages[0].name, fetched[0].name)
+        self.assertEqual(available_packages[0].version, fetched[0].version)
+        self.assertEqual(available_packages[1].name, fetched[1].name)
+        self.assertEqual(available_packages[1].version, fetched[1].version)
+
+    def test_get_versions_fetches_newest(self):
+        available_packages = [
+            DummyFetchedPackage("bar", "1.0"),
+            DummyFetchedPackage("bar", "1.1"),
+        ]
+        source = self.useFixture(AptSourceFixture(available_packages))
+        fetcher = self.get_fetcher([source])
+        fetched = fetcher.get_versions(["bar"])
+        self.assertEqual(available_packages[1].name, fetched[0].name)
+        self.assertEqual(available_packages[1].version, fetched[0].version)
+
+    def test_get_versions_fetches_newest_from_multiple_sources(self):
+        old_source_packages = [DummyFetchedPackage("bar", "1.0")]
+        new_source_packages = [DummyFetchedPackage("bar", "1.1")]
+        old_source = self.useFixture(AptSourceFixture(old_source_packages))
+        new_source = self.useFixture(AptSourceFixture(new_source_packages))
+        fetcher = self.get_fetcher([old_source, new_source])
+        fetched = fetcher.get_versions(["bar"])
+        self.assertEqual(new_source_packages[0].name, fetched[0].name)
+        self.assertEqual(new_source_packages[0].version, fetched[0].version)
+
+    def test_get_versions_fetches_from_correct_architecture(self):
+        wanted_package = DummyFetchedPackage(
+            "foo", "1.0", architecture="arch1")
+        unwanted_package = DummyFetchedPackage(
+            "foo", "1.1", architecture="arch2")
+        source = self.useFixture(
+            AptSourceFixture([wanted_package, unwanted_package]))
+        fetcher = self.get_fetcher([source], architecture="arch1")
+        package_info = fetcher.get_versions(['foo'])[0]
+        self.assertEqual(wanted_package.name, package_info.name)
+        self.assertEqual(wanted_package.version, package_info.version)
+
+    def test_get_versions_doesnt_set_content(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        package_info = fetcher.get_versions(["foo"])[0]
+        self.assertIs(None, package_info.content)