Mercurial > treepkg
diff test/test_builder.py @ 296:ce7be2fb93ee
Make it easy to install extra binaries into subdirectories of extra-pkg.
This makes it easier to manage the extra-pkg directory when it contains
manually added packages and automatically added packages from one of the
package tracks by putting the automatically added packages into
extra-pkg/auto and manually added packages into extra-pkg/manual.
To this end, add parameter subdir to PBuilder.add_binaries_to_extra_pkg
method with default value "auto". Adapt the test case accordingly.
Also add the command line argument --subdir to bin/treepkgbuilder.py
add-binaries command, this time with default value "manual".
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Wed, 18 Nov 2009 18:11:22 +0000 |
| parents | cbcd8f549ff7 |
| children | f06f707d9fda |
line wrap: on
line diff
--- a/test/test_builder.py Tue Oct 06 13:34:49 2009 +0000 +++ b/test/test_builder.py Wed Nov 18 18:11:22 2009 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008 by Intevation GmbH +# Copyright (C) 2007, 2008, 2009 by Intevation GmbH # Authors: # Bernhard Herzog <bh@intevation.de> # @@ -375,6 +375,9 @@ builder.add_binaries_to_extra_pkg([self.minimal_package_deb]) self.assertEquals(sorted(os.listdir(self.extra_pkg_dir)), - ["Packages", "Release", "minimal_1.0-1_i386.deb"]) + ["Packages", "Release", "auto"]) + self.assertEquals(sorted(os.listdir(os.path.join(self.extra_pkg_dir, + "auto"))), + ["minimal_1.0-1_i386.deb"]) self.check_command_line(['/usr/sbin/pbuilder', 'update', '--configfile', self.pbuilderrc])