aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2022-05-25 22:55:03 +0200
committerGuido Günther <agx@sigxcpu.org>2022-05-25 23:09:37 +0200
commit83e77912564c6daaa965491f868afc338d52b110 (patch)
tree348f19731ff073e125d95fa380eed0a6bd83ffe2
parentbd529f0ed288553049751aa478a0eae83e1988c6 (diff)
tests: Test import-orig from upstream branch
-rw-r--r--tests/component/deb/test_import_orig.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/component/deb/test_import_orig.py b/tests/component/deb/test_import_orig.py
index 9581f5de..1feed773 100644
--- a/tests/component/deb/test_import_orig.py
+++ b/tests/component/deb/test_import_orig.py
@@ -164,6 +164,14 @@ class TestImportOrig(ComponentTestBase):
eq_(old, new, "Checksum %s of regenerated tarball %s does not match original %s" %
(f, old, new))
+ @RepoFixtures.quilt30(DEFAULT_DSC, opts=['--pristine-tar'])
+ def test_update_from_upstream_branch(self, repo):
+ orig = self._orig('2.8')
+ repo.checkout('upstream')
+ ok_(import_orig(['arg0', '--no-interactive', '--pristine-tar', orig]) == 0)
+ self._check_repo_state(repo, 'upstream', ['master', 'upstream', 'pristine-tar'],
+ tags=['debian/2.6-2', 'upstream/2.6', 'upstream/2.8'])
+
def test_tag_exists(self):
"""Test that importing an already imported version fails"""
repo = GitRepository.create(self.pkg)