diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-11-09 13:27:54 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-11-09 13:30:07 +0100 |
| commit | e5df7d0bb77c6f288c49b4c0b0df0ca0a9e9c5db (patch) | |
| tree | ec11c7c3535883c5001c0477691321facc582f7c /tests | |
| parent | 0e8fd89e0b7e84ca91f07060db5695e5f89af36c (diff) | |
buildpackage: unpack additional tarballs as well in --git-overlay mode
Closes: #881253
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/deb/fixtures.py | 3 | ||||
| -rw-r--r-- | tests/component/deb/test_buildpackage.py | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/component/deb/fixtures.py b/tests/component/deb/fixtures.py index 1009a600..1b82557a 100644 --- a/tests/component/deb/fixtures.py +++ b/tests/component/deb/fixtures.py @@ -42,9 +42,10 @@ DEFAULT_ADDITIONAL_TAR = os.path.join(DEB_TEST_DATA_DIR, 'hello-debhelper_%s.dsc' % '2.8-1') DEFAULT_OVERLAY = os.path.join(DEB_TEST_DATA_DIR, - 'dsc-3.0', + 'dsc-3.0-additional-tarballs', 'hello-debhelper_%s.debian.tar.gz' % '2.8-1') + class RepoFixtures(object): @classmethod def native(cls, dsc=DEFAULT_NATIVE, opts=None): diff --git a/tests/component/deb/test_buildpackage.py b/tests/component/deb/test_buildpackage.py index 71c30c96..70e57d4a 100644 --- a/tests/component/deb/test_buildpackage.py +++ b/tests/component/deb/test_buildpackage.py @@ -197,9 +197,11 @@ class TestBuildpackage(ComponentTestBase): '--git-compression=gzip', '--git-tarball-dir=%s' % tarball_dir, '--git-no-purge', - '--git-export-dir=../foo']) - ok_(os.path.exists('../foo/hello-debhelper-2.8/configure')) - ok_(os.path.exists('../foo/hello-debhelper-2.8/debian/changelog')) + '--git-component=foo', + '--git-export-dir=../overlay']) + ok_(os.path.exists('../overlay/hello-debhelper-2.8/configure')) + ok_(os.path.exists('../overlay/hello-debhelper-2.8/debian/changelog')) + ok_(os.path.exists('../overlay/hello-debhelper-2.8/foo/test1')) @RepoFixtures.quilt30() def test_export_wc_buildpackage(self, repo): |