diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-03 17:54:33 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-03 17:54:33 -0300 |
| commit | 68cfda104af42a06c416409400b8548702ad6468 (patch) | |
| tree | 95f6c6434b450976d0ec19a2c5f0f5fcfcf14e1e /tests/04_test_submodules.py | |
| parent | 9480295b315ac2485badcfa00a3c91c711942dd0 (diff) | |
Move compressed tarball creation to PkgGitRepository
Diffstat (limited to 'tests/04_test_submodules.py')
| -rw-r--r-- | tests/04_test_submodules.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/04_test_submodules.py b/tests/04_test_submodules.py index 4c297e77..a39a7a46 100644 --- a/tests/04_test_submodules.py +++ b/tests/04_test_submodules.py @@ -14,11 +14,10 @@ import gbp.git import gbp.command_wrappers from gbp.deb.policy import DebianPkgPolicy as Policy +from gbp.deb.git import DebianGitRepository from gbp.scripts import buildpackage from gbp.scripts import export_orig -from gbp.scripts.common.buildpackage import (git_archive_submodules, - git_archive_single) from tests.testutils import ls_zip REPO = None @@ -45,7 +44,7 @@ def setup(): TMPDIR = context.new_tmpdir(__name__) REPODIR = TMPDIR.join('test_repo') - REPO = gbp.git.GitRepository.create(REPODIR) + REPO = DebianGitRepository.create(REPODIR) for name in SUBMODULE_NAMES: SUBMODULES.append(Submodule(name, str(TMPDIR))) @@ -149,14 +148,14 @@ def test_create_tarballs(): def test_create_zip_archives(): """Create an upstream zip archive""" - git_archive_submodules(REPO, 'HEAD', 'with-submodules.zip', 'test', - '', '', '', 'zip') + REPO.archive_comp('HEAD', 'with-submodules.zip', 'test', + '', '', '', 'zip', submodules=True) # Check that submodules were included contents = ls_zip('with-submodules.zip') ok_('test/test_submodule/testfile' in contents) - git_archive_single('HEAD', 'without-submodules.zip', 'test', - '', None, '', 'zip') + REPO.archive_comp('HEAD', 'without-submodules.zip', 'test', + '', None, '', 'zip', submodules=False) contents = ls_zip('without-submodules.zip') ok_('test/test_submodule/testfile' not in contents) |