Merge lp:~james-w/linaro-image-tools/add-packages-to-hwpack into lp:linaro-image-tools/11.11

[James Westby]

Hi,

This starts to glue things together such that we can actually have
useful hardware packs created. It adds two methods on the HardwarePack
class, add_packages and add_sources, which allow you to add sources
entries and .debs to the hwpack.

There is little new code required to implement these, and the majority
of the changes are consolidation of existing code to make it more general,
which is a great sign I think.

The hwpack requires a Packages file pre-generated inside it. Because of
the way that we plan to install hwpacks, this isn't one that a user will
ever see if they use a package manager to look at available or installed
packages. Therefore I decided to re-use the code I added in the previous
branch for adding a sparse Packages file that apt understands just fine,
but which isn't appropriate for end users.

In addition, I made the hwpack.testing.Package class be a subclass of
the new FetchedPackage class, and implemented __eq__, which makes some
tests easier to write. Now the testing one is just one with dummy
content that we control more directly, the superclass is fine for
use in the real world.

Thanks,

James

[lp:~james-w/linaro-image-tools/add-packages-to-hwpack]

98. By James Westby on 2010-09-02

Merge fetch-packges.

99. By James Westby on 2010-09-02

Add a docstring to get_packages_file.

[Guilherme Salgado (salgado)]

Hi James,

This one looks good as well; I have just a few minor suggestions.

> === modified file 'hwpack/hardwarepack.py'
> --- hwpack/hardwarepack.py 2010-09-01 23:50:25 +0000
> +++ hwpack/hardwarepack.py 2010-09-02 19:12:45 +0000
> @@ -1,4 +1,5 @@
> from hwpack.better_tarfile import writeable_tarfile
> +from hwpack.packages import get_packages_file
>
>
> class Metadata(object):
> @@ -75,6 +76,8 @@
> :type metadata: Metadata
> """
> self.metadata = metadata
> + self.sources = {}
> + self.packages = []
>
> def filename(self):
> """The filename that this hardware pack should have.
> @@ -92,6 +95,37 @@
> return "hwpack_%s_%s%s.tar.gz" % (
> self.metadata.name, self.metadata.version, support_suffix)
>
> + def add_sources(self, sources):
> + """Add sources to the hardware pack.

Maybe """Add apt sources ..."""?

> +
> + Given a dict of names and the source lines this will add
> + them to the hardware pack.
> +
> + The names should be an identifier for the source, and the
> + source lines should be what is put in sources.list for that
> + source, minus the "deb" part.
> +
> + Arguments passed to this method will overwrite any that were
> + passed in previous calls with the same identifier, but will
> + be used in addition to any with different identifiers.

I don't quite understand what this means. Do you mean that this will
overwrite existing sources with the same identifier and add the ones with
unseen identifiers?

> +
> + :param sources: the sources to use as a dict mapping identifiers
> + to sources entries.
> + :type sources: a dict mapping str to str
> + """
> + self.sources.update(sources)
> +
> + def add_packages(self, packages):
> + """Add packages to the hardware pack.
> +
> + Given a list of packages this will add them to the hardware
> + pack.
> +
> + :param packages: the packages to add
> + :type packages: FetchedPackage
> + """
> + self.packages += packages
> +
> def to_file(self, fileobj):
> """Write the hwpack to a file object.
>
> @@ -112,9 +146,22 @@
> self.FORMAT_FILENAME, self.FORMAT + "\n")
> tf.create_file_from_string(
> self.METADATA_FILENAME, str(self.metadata))
> - # TODO: include packages and sources etc.
> - tf.create_file_from_string(self.MANIFEST_FILENAME, "")
> tf.create_dir(self.PACKAGES_DIRNAME)
> - tf.create_file_from_string(self.PACKAGES_FILENAME, "")
> + manifest_content = ""
> + for package in self.packages:
> + tf.create_file_from_string(
> + self.PACKAGES_DIRNAME + "/" + package.filename,
> + package.content.read())
> + manifest_content += "%s %s\n" % (
> + package.name, package.version)

I wonder if it'd be a problem to use '"%s=%s" % (name, version)' here so that
we could feed such lines directly to apt. AIUI, not all packages will
define a version, s...

review: Approve (code)

[James Westby (james-w)]

On Thu, 02 Sep 2010 21:14:41 -0000, Guilherme Salgado <email address hidden> wrote:
> > + def add_sources(self, sources):
> > + """Add sources to the hardware pack.
>
> Maybe """Add apt sources ..."""?

Yes, and I will change the method name too, we might need to add source
packages at some stage.

> > + Arguments passed to this method will overwrite any that were
> > + passed in previous calls with the same identifier, but will
> > + be used in addition to any with different identifiers.
>
> I don't quite understand what this means. Do you mean that this will
> overwrite existing sources with the same identifier and add the ones with
> unseen identifiers?

Yes, the implementation is {}.update(), so it will overwrite anything
existing. Suggestions for how to phrase it better welcome.

> I wonder if it'd be a problem to use '"%s=%s" % (name, version)' here so that
> we could feed such lines directly to apt. AIUI, not all packages will
> define a version, so we might need to do this only when a version is
> specified, but it'd simplify things when installing the packages. What do you
> think?

One of the use cases in the spec is just using the hwpack as as source
of package names and apt sources. In that case you want to discard any
version there, so I went with the format that was easy to put together,
rather than the slightly trickier to split, even though using versions
will be more common.

We can change the spec if you would prefer to implement it the other way
around.

> Wouldn't it be slightly simpler to append strings to 'parts' and then have
> just one "\n".join() here? Like
>
> parts.append("Package: " + package.name)
> ...
> content += "\n".join(parts)
>
> No big deal, though; just suggesting because the nested join()s make it a bit
> less obvious what we'll get in the end, at least to me.

Yes, that's reasonable.

>
> typo: packges

Thanks.

> Minor nitpick: you could use textwrap.dedent() in order to not affect the code
> flow with the unindented multi-line string.

Thanks, I didn't know about that one. It's a shame that it involves a
backslash though.

> typo: packges

Thanks.

Thanks for the review. I will make the changes requested.

James

[Guilherme Salgado (salgado)]

On Thu, 2010-09-02 at 21:45 +0000, James Westby wrote:
> On Thu, 02 Sep 2010 21:14:41 -0000, Guilherme Salgado <email address hidden> wrote:
> > > + def add_sources(self, sources):
> > > + """Add sources to the hardware pack.
> >
> > Maybe """Add apt sources ..."""?
>
> Yes, and I will change the method name too, we might need to add source
> packages at some stage.
>

Cool.

> > > + Arguments passed to this method will overwrite any that were
> > > + passed in previous calls with the same identifier, but will
> > > + be used in addition to any with different identifiers.
> >
> > I don't quite understand what this means. Do you mean that this will
> > overwrite existing sources with the same identifier and add the ones with
> > unseen identifiers?
>
> Yes, the implementation is {}.update(), so it will overwrite anything
> existing. Suggestions for how to phrase it better welcome.

I think I was confused by 'Arguments', as this method only takes one, so
maybe just changing that to 'Sources'.

>
> > I wonder if it'd be a problem to use '"%s=%s" % (name, version)' here so that
> > we could feed such lines directly to apt. AIUI, not all packages will
> > define a version, so we might need to do this only when a version is
> > specified, but it'd simplify things when installing the packages. What do you
> > think?
>
> One of the use cases in the spec is just using the hwpack as as source
> of package names and apt sources. In that case you want to discard any
> version there, so I went with the format that was easy to put together,
> rather than the slightly trickier to split, even though using versions
> will be more common.
>
> We can change the spec if you would prefer to implement it the other way
> around.

If using versions really is going to be more common, then I'd be in
favour of changing as it should be quite easy to do so here, right?

>
> > Wouldn't it be slightly simpler to append strings to 'parts' and then have
> > just one "\n".join() here? Like
> >
> > parts.append("Package: " + package.name)
> > ...
> > content += "\n".join(parts)
> >
> > No big deal, though; just suggesting because the nested join()s make it a bit
> > less obvious what we'll get in the end, at least to me.
>
> Yes, that's reasonable.
>
> >
> > typo: packges
>
> Thanks.
>
> > Minor nitpick: you could use textwrap.dedent() in order to not affect the code
> > flow with the unindented multi-line string.
>
> Thanks, I didn't know about that one. It's a shame that it involves a
> backslash though.

Why is that? You can still use the triple quotes and a multi-line
string, the only difference being that you'll indent it:

    self.assertEqual(dedent("""
        Packages: foo
        Version: bar
        ...
        """ % replacements,
        get_packages_file([package]))

--
Guilherme Salgado <https://launchpad.net/~salgado>

[lp:~james-w/linaro-image-tools/add-packages-to-hwpack]

100. By James Westby on 2010-09-02

Rename add_sources to add_apt_sources and update the docstring.

Thanks Guilherme.

101. By James Westby on 2010-09-02

Avoid a double join by storing strings not tuples.

Thanks Guilherme.

102. By James Westby on 2010-09-02

Fix typos. Thanks Guilherme.

103. By James Westby on 2010-09-02

Correct another typo. Thanks Guilherme.

104. By James Westby on 2010-09-02

Use textwrap to avoid a multiline string breaking formatting.

Thanks Guilherme.

[James Westby (james-w)]

On Thu, 02 Sep 2010 22:01:39 -0000, Guilherme Salgado <email address hidden> wrote:
> I think I was confused by 'Arguments', as this method only takes one, so
> maybe just changing that to 'Sources'.

I changed the wording to just be a bit simpler, let me know what you think.

> If using versions really is going to be more common, then I'd be in
> favour of changing as it should be quite easy to do so here, right?

Yeah, really easy to do here.

> Why is that? You can still use the triple quotes and a multi-line
> string, the only difference being that you'll indent it:
>
> self.assertEqual(dedent("""
> Packages: foo
> Version: bar
> ...
> """ % replacements,
> get_packages_file([package]))

That gives an extra newline at the start doesn't it?

/me tries...

Yes, the test fails with that arrangement due to the start of the string
not matching.

Thanks,

James

[Guilherme Salgado (salgado)]

On Thu, 2010-09-02 at 23:07 +0000, James Westby wrote:
> On Thu, 02 Sep 2010 22:01:39 -0000, Guilherme Salgado <email address hidden> wrote:
> > I think I was confused by 'Arguments', as this method only takes one, so
> > maybe just changing that to 'Sources'.
>
> I changed the wording to just be a bit simpler, let me know what you think.

It looks good, thanks.

>
> > If using versions really is going to be more common, then I'd be in
> > favour of changing as it should be quite easy to do so here, right?
>
> Yeah, really easy to do here.
>

Cool.

> > Why is that? You can still use the triple quotes and a multi-line
> > string, the only difference being that you'll indent it:
> >
> > self.assertEqual(dedent("""
> > Packages: foo
> > Version: bar
> > ...
> > """ % replacements,
> > get_packages_file([package]))
>
> That gives an extra newline at the start doesn't it?
>
> /me tries...
>
> Yes, the test fails with that arrangement due to the start of the string
> not matching.

You're right; it preserves newlines.

 status approved

--
Guilherme Salgado <https://launchpad.net/~salgado>

review: Approve

=== modified file 'hwpack/hardwarepack.py'
--- hwpack/hardwarepack.py	2010-09-01 23:50:25 +0000
+++ hwpack/hardwarepack.py	2010-09-02 22:03:43 +0000
@@ -1,4 +1,5 @@
 from hwpack.better_tarfile import writeable_tarfile
+from hwpack.packages import get_packages_file
 
 
 class Metadata(object):
@@ -75,6 +76,8 @@
         :type metadata: Metadata
         """
         self.metadata = metadata
+        self.sources = {}
+        self.packages = []
 
     def filename(self):
         """The filename that this hardware pack should have.
@@ -92,6 +95,37 @@
         return "hwpack_%s_%s%s.tar.gz" % (
             self.metadata.name, self.metadata.version, support_suffix)
 
+    def add_apt_sources(self, sources):
+        """Add APT sources to the hardware pack.
+
+        Given a dict of names and the source lines this will add
+        them to the hardware pack.
+
+        The names should be an identifier for the source, and the
+        source lines should be what is put in sources.list for that
+        source, minus the "deb" part.
+
+        If you pass an identifier that has already been passed to this
+        method, then the previous value will be replaced with the new
+        value.
+
+        :param sources: the sources to use as a dict mapping identifiers
+            to sources entries.
+        :type sources: a dict mapping str to str
+        """
+        self.sources.update(sources)
+
+    def add_packages(self, packages):
+        """Add packages to the hardware pack.
+
+        Given a list of packages this will add them to the hardware
+        pack.
+
+        :param packages: the packages to add
+        :type packages: FetchedPackage
+        """
+        self.packages += packages
+
     def to_file(self, fileobj):
         """Write the hwpack to a file object.
 
@@ -112,9 +146,22 @@
                 self.FORMAT_FILENAME, self.FORMAT + "\n")
             tf.create_file_from_string(
                 self.METADATA_FILENAME, str(self.metadata))
-            # TODO: include packages and sources etc.
-            tf.create_file_from_string(self.MANIFEST_FILENAME, "")
             tf.create_dir(self.PACKAGES_DIRNAME)
-            tf.create_file_from_string(self.PACKAGES_FILENAME, "")
+            manifest_content = ""
+            for package in self.packages:
+                tf.create_file_from_string(
+                    self.PACKAGES_DIRNAME + "/" + package.filename,
+                    package.content.read())
+                manifest_content += "%s %s\n" % (
+                    package.name, package.version)
+            tf.create_file_from_string(
+                self.MANIFEST_FILENAME, manifest_content)
+            tf.create_file_from_string(
+                self.PACKAGES_FILENAME, get_packages_file(self.packages))
             tf.create_dir(self.SOURCES_LIST_DIRNAME)
+            for source_name, source_info in self.sources.items():
+                tf.create_file_from_string(
+                    self.SOURCES_LIST_DIRNAME + "/" + source_name,
+                    "deb " + source_info + "\n")
+            # TODO: include sources keys etc.
             tf.create_dir(self.SOURCES_LIST_GPG_DIRNAME)

=== modified file 'hwpack/packages.py'
--- hwpack/packages.py	2010-09-02 22:03:43 +0000
+++ hwpack/packages.py	2010-09-02 22:03:43 +0000
@@ -7,6 +7,29 @@
 import apt_pkg
 
 
+def get_packages_file(packages):
+    """Get the Packages file contents indexing `packages`.
+
+    :param packages: the packages to index.
+    :type packages: an iterable of FetchedPackages.
+    :return: the Packages file contents indexing `packages`.
+    :rtype: str
+    """
+    content = ""
+    for package in packages:
+        parts = []
+        parts.append('Package: %s' % package.name)
+        parts.append('Version: %s' % package.version)
+        parts.append('Filename: %s' % package.filename)
+        parts.append('Size: %d' % package.size)
+        # TODO: architecture support
+        parts.append('Architecture: all')
+        parts.append('MD5sum: %s' % package.md5)
+        content += "\n".join(parts)
+        content += "\n\n"
+    return content
+
+
 class DummyProgress(object):
     """An AcquireProgress that silences all output.
 

=== modified file 'hwpack/testing.py'
--- hwpack/testing.py	2010-09-02 22:03:43 +0000
+++ hwpack/testing.py	2010-09-02 22:03:43 +0000
@@ -9,7 +9,7 @@
 from testtools import TestCase
 
 from hwpack.better_tarfile import writeable_tarfile
-from hwpack.packages import FetchedPackage
+from hwpack.packages import get_packages_file, FetchedPackage
 
 
 @contextmanager
@@ -109,14 +109,7 @@
                 os.path.join(self.rootdir, package.filename), 'wb') as f:
                 f.write(package.content.read())
         with open(os.path.join(self.rootdir, "Packages"), 'wb') as f:
-            for package in self.packages:
-                f.write('Package: %s\n' % package.name)
-                f.write('Version: %s\n' % package.version)
-                f.write('Filename: %s\n' % package.filename)
-                f.write('Size: %d\n' % package.size)
-                f.write('Architecture: all\n')
-                f.write('MD5sum: %s\n' % package.md5)
-                f.write('\n')
+            f.write(get_packages_file(self.packages))
 
     def tearDown(self):
         if os.path.exists(self.rootdir):

=== modified file 'hwpack/tests/test_hardwarepack.py'
--- hwpack/tests/test_hardwarepack.py	2010-09-02 00:01:18 +0000
+++ hwpack/tests/test_hardwarepack.py	2010-09-02 22:03:43 +0000
@@ -4,7 +4,9 @@
 from testtools import TestCase
 
 from hwpack.hardwarepack import HardwarePack, Metadata
+from hwpack.packages import get_packages_file
 from hwpack.tarfile_matchers import TarfileHasFile
+from hwpack.testing import DummyFetchedPackage
 
 
 class MetadataTests(TestCase):
@@ -159,11 +161,62 @@
         tf = self.get_tarfile(hwpack)
         self.assertThat(tf, HardwarePackHasFile("manifest", content=""))
 
+    def test_manifest_contains_package_info(self):
+        package1 = DummyFetchedPackage("foo", "1.1")
+        package2 = DummyFetchedPackage("bar", "1.2")
+        hwpack = HardwarePack(self.metadata)
+        hwpack.add_packages([package1, package2])
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf,
+            HardwarePackHasFile("manifest", content="foo 1.1\nbar 1.2\n"))
+
     def test_creates_pkgs_dir(self):
         hwpack = HardwarePack(self.metadata)
         tf = self.get_tarfile(hwpack)
         self.assertThat(tf, HardwarePackHasFile("pkgs", type=tarfile.DIRTYPE))
 
+    def test_adds_packages(self):
+        package = DummyFetchedPackage("foo", "1.1")
+        hwpack = HardwarePack(self.metadata)
+        hwpack.add_packages([package])
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf,
+            HardwarePackHasFile("pkgs/%s" % package.filename,
+                content=package.content.read()))
+
+    def test_adds_multiple_packages_at_once(self):
+        package1 = DummyFetchedPackage("foo", "1.1")
+        package2 = DummyFetchedPackage("bar", "1.1")
+        hwpack = HardwarePack(self.metadata)
+        hwpack.add_packages([package1, package2])
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf,
+            HardwarePackHasFile("pkgs/%s" % package1.filename,
+                content=package1.content.read()))
+        self.assertThat(
+            tf,
+            HardwarePackHasFile("pkgs/%s" % package2.filename,
+                content=package2.content.read()))
+
+    def test_adds_multiple_in_multiple_steps(self):
+        package1 = DummyFetchedPackage("foo", "1.1")
+        package2 = DummyFetchedPackage("bar", "1.1")
+        hwpack = HardwarePack(self.metadata)
+        hwpack.add_packages([package1])
+        hwpack.add_packages([package2])
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf,
+            HardwarePackHasFile("pkgs/%s" % package1.filename,
+                content=package1.content.read()))
+        self.assertThat(
+            tf,
+            HardwarePackHasFile("pkgs/%s" % package2.filename,
+                content=package2.content.read()))
+
     def test_creates_Packages_file(self):
         hwpack = HardwarePack(self.metadata)
         tf = self.get_tarfile(hwpack)
@@ -174,12 +227,57 @@
         tf = self.get_tarfile(hwpack)
         self.assertThat(tf, HardwarePackHasFile("pkgs/Packages", content=""))
 
+    def test_Packages_file_correct_contents_with_packages(self):
+        package1 = DummyFetchedPackage("foo", "1.1")
+        package2 = DummyFetchedPackage("bar", "1.1")
+        hwpack = HardwarePack(self.metadata)
+        hwpack.add_packages([package1, package2])
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf,
+            HardwarePackHasFile(
+                "pkgs/Packages",
+                content=get_packages_file([package1, package2])))
+
     def test_creates_sources_list_dir(self):
         hwpack = HardwarePack(self.metadata)
         tf = self.get_tarfile(hwpack)
         self.assertThat(
             tf, HardwarePackHasFile("sources.list.d", type=tarfile.DIRTYPE))
 
+    def test_adds_sources_list_file(self):
+        hwpack = HardwarePack(self.metadata)
+        source = 'http://example.org/ ubuntu'
+        hwpack.add_apt_sources({'ubuntu': source})
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf, HardwarePackHasFile("sources.list.d/ubuntu",
+                content="deb " + source + "\n"))
+
+    def test_adds_multiple_sources_list_files(self):
+        hwpack = HardwarePack(self.metadata)
+        source1 = 'http://example.org/ ubuntu main universe'
+        source2 = 'http://example.org/ linaro'
+        hwpack.add_apt_sources({'ubuntu': source1, 'linaro': source2})
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf, HardwarePackHasFile("sources.list.d/ubuntu",
+                content="deb " + source1 + "\n"))
+        self.assertThat(
+            tf, HardwarePackHasFile("sources.list.d/linaro",
+                content="deb " + source2 + "\n"))
+
+    def test_overwrites_sources_list_file(self):
+        hwpack = HardwarePack(self.metadata)
+        old_source = 'http://example.org/ ubuntu'
+        hwpack.add_apt_sources({'ubuntu': old_source})
+        new_source = 'http://example.org/ ubuntu main universe'
+        hwpack.add_apt_sources({'ubuntu': new_source})
+        tf = self.get_tarfile(hwpack)
+        self.assertThat(
+            tf, HardwarePackHasFile("sources.list.d/ubuntu",
+                content="deb " + new_source + "\n"))
+
     def test_creates_sources_list_gpg_dir(self):
         hwpack = HardwarePack(self.metadata)
         tf = self.get_tarfile(hwpack)

=== modified file 'hwpack/tests/test_packages.py'
--- hwpack/tests/test_packages.py	2010-09-02 22:03:43 +0000
+++ hwpack/tests/test_packages.py	2010-09-02 22:03:43 +0000
@@ -1,10 +1,12 @@
 import os
 from StringIO import StringIO
+import textwrap
 
 from testtools import TestCase
 
 from hwpack.packages import (
     FetchedPackage,
+    get_packages_file,
     PackageFetcher,
     )
 from hwpack.testing import (
@@ -14,6 +16,31 @@
     )
 
 
+class GetPackagesFileTests(TestCase):
+
+    def test_single_stanza(self):
+        package = DummyFetchedPackage("foo", "1.1")
+        self.assertEqual(textwrap.dedent("""\
+            Package: foo
+            Version: 1.1
+            Filename: %(filename)s
+            Size: %(size)d
+            Architecture: all
+            MD5sum: %(md5)s
+            \n""" % {
+                'filename': package.filename,
+                'size': package.size,
+                'md5': package.md5,
+            }), get_packages_file([package]))
+
+    def test_two_stanzas(self):
+        package1 = DummyFetchedPackage("foo", "1.1")
+        package2 = DummyFetchedPackage("bar", "1.2")
+        self.assertEqual(
+            get_packages_file([package1]) + get_packages_file([package2]),
+            get_packages_file([package1, package2]))
+
+
 class FetchedPackageTests(TestCase):
 
     def test_attributes(self):
@@ -173,26 +200,26 @@
         self.assertRaises(
             KeyError, fetcher.fetch_packages, ["foo", "nothere"])
 
-    def test_fetch_packges_fetches_no_packages(self):
+    def test_fetch_packages_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.fetch_packages([])))
 
-    def test_fetch_packges_fetches_single_package(self):
+    def test_fetch_packages_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.fetch_packages(["foo"])))
 
-    def test_fetch_packges_fetches_correct_packge(self):
+    def test_fetch_packages_fetches_correct_package(self):
         available_package = DummyFetchedPackage("foo", "1.0")
         source = self.useFixture(AptSourceFixture([available_package]))
         fetcher = self.get_fetcher([source])
         self.assertEqual(
             available_package, fetcher.fetch_packages(["foo"])[0])
 
-    def test_fetch_packges_fetches_multiple_packages(self):
+    def test_fetch_packages_fetches_multiple_packages(self):
         available_packages = [
             DummyFetchedPackage("bar", "1.0"),
             DummyFetchedPackage("foo", "1.0"),
@@ -201,7 +228,7 @@
         fetcher = self.get_fetcher([source])
         self.assertEqual(2, len(fetcher.fetch_packages(["foo", "bar"])))
 
-    def test_fetch_packges_fetches_multiple_packages_correctly(self):
+    def test_fetch_packages_fetches_multiple_packages_correctly(self):
         available_packages = [
             DummyFetchedPackage("foo", "1.0"),
             DummyFetchedPackage("bar", "1.0"),