diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/deb/test_buildpackage.py | 8 | ||||
| -rw-r--r-- | tests/component/deb/test_import_dsc.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/component/deb/test_buildpackage.py b/tests/component/deb/test_buildpackage.py index 19dfa82..fe1e140 100644 --- a/tests/component/deb/test_buildpackage.py +++ b/tests/component/deb/test_buildpackage.py @@ -106,7 +106,7 @@ class TestBuildpackage(ComponentTestBase): "GBP_BRANCH", "GBP_SHA1"]) - def test_subtarball_generation(self): + def test_component_generation(self): """Test that generating tarball and additional tarball works without pristine-tar""" pkg = 'hello-debhelper' dsc = self._dsc_name(pkg, '2.8-1', 'dsc-3.0-additional-tarballs') @@ -120,7 +120,7 @@ class TestBuildpackage(ComponentTestBase): for t in tarballs: self.assertFalse(os.path.exists(t), "Tarball %s must not exist" % t) ret = buildpackage(['arg0', - '--git-subtarball=foo', + '--git-component=foo', '--git-no-pristine-tar', '--git-posttag=printenv > posttag.out', '--git-builder=touch builder-run.stamp', @@ -129,7 +129,7 @@ class TestBuildpackage(ComponentTestBase): for t in tarballs: self.assertTrue(os.path.exists(t), "Tarball %s not found" % t) - def test_pristinetar_subtarball_generation(self): + def test_pristinetar_component_generation(self): """Test that generating tarball and additional tarball works with pristine-tar""" pkg = 'hello-debhelper' dsc = self._dsc_name(pkg, '2.8-1', 'dsc-3.0-additional-tarballs') @@ -143,7 +143,7 @@ class TestBuildpackage(ComponentTestBase): for t in tarballs: self.assertFalse(os.path.exists(t), "Tarball %s must not exist" % t) ret = buildpackage(['arg0', - '--git-subtarball=foo', + '--git-component=foo', '--git-pristine-tar', '--git-posttag=printenv > posttag.out', '--git-builder=touch builder-run.stamp', diff --git a/tests/component/deb/test_import_dsc.py b/tests/component/deb/test_import_dsc.py index 549b5e3..d7a96ff 100644 --- a/tests/component/deb/test_import_dsc.py +++ b/tests/component/deb/test_import_dsc.py @@ -112,7 +112,7 @@ class TestImportDsc(ComponentTestBase): ok_(commits == expected, "Found %d commit instead of %d" % (commits, expected)) dsc = DscFile.parse(dscfile) - # Check if we can rebuild the tarball and subtarball + # Check if we can rebuild the tarball and component ptars = [('hello-debhelper_2.8.orig.tar.gz', 'pristine-tar', '', dsc.tgz), ('hello-debhelper_2.8.orig-foo.tar.gz', 'pristine-tar^', 'foo', dsc.additional_tarballs['foo'])] @@ -121,7 +121,7 @@ class TestImportDsc(ComponentTestBase): for f, w, s, o in ptars: eq_(repo.get_subject(w), 'pristine-tar data for %s' % f) old = self.hash_file(o) - p.checkout('hello-debhelper', '2.8', 'gzip', outdir, subtarball=s) + p.checkout('hello-debhelper', '2.8', 'gzip', outdir, component=s) new = self.hash_file(os.path.join(outdir, f)) eq_(old, new, "Checksum %s of regenerated tarball %s does not match original %s" % (f, old, new)) |