summaryrefslogtreecommitdiffhomepage
path: root/tests/04_test_submodules.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-08-03 17:54:33 -0300
committerGuido Günther <agx@sigxcpu.org>2017-08-03 17:54:33 -0300
commitc49a0381f496fae4f94a1fbeed278f014ae556b7 (patch)
tree5491f9809c97f97e53f60938e0f3069953f058d4 /tests/04_test_submodules.py
parent702819a4a3fdd9426bd36bbbd91a3d7ba916668a (diff)
deb.git: helper for upstream tarball creation
once we have sorted out all the parameters let DebianGitRepository handle the details.
Diffstat (limited to 'tests/04_test_submodules.py')
-rw-r--r--tests/04_test_submodules.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/04_test_submodules.py b/tests/04_test_submodules.py
index 4cff46d0..52e15ddb 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.pkg.git import PkgGitRepository
+from gbp.deb.git import DebianGitRepository
from gbp.pkg import Compressor
from gbp.scripts import buildpackage
-from gbp.scripts import export_orig
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 = PkgGitRepository.create(REPODIR)
+ REPO = DebianGitRepository.create(REPODIR)
for name in SUBMODULE_NAMES:
SUBMODULES.append(Submodule(name, str(TMPDIR)))
@@ -140,12 +139,12 @@ def test_create_tarballs():
comp = Compressor('bzip2')
# Tarball with submodules
s = MockedSource('0.1')
- ok_(export_orig.git_archive(REPO, s, str(TMPDIR), "HEAD", comp,
- with_submodules=True))
+ ok_(REPO.create_upstream_tarball_via_git_archive(s, str(TMPDIR), "HEAD", comp,
+ with_submodules=True))
# Tarball without submodules
s = MockedSource('0.2')
- ok_(export_orig.git_archive(REPO, s, str(TMPDIR), "HEAD", comp,
- with_submodules=False))
+ ok_(REPO.create_upstream_tarball_via_git_archive(s, str(TMPDIR), "HEAD", comp,
+ with_submodules=False))
def test_create_zip_archives():