aboutsummaryrefslogtreecommitdiff
path: root/tests/component/deb/test_import_dsc.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-03-13 17:37:14 +0100
committerGuido Günther <agx@sigxcpu.org>2016-03-13 18:04:16 +0100
commit9990b889d8775ed700ae28c3f17ce3b600eb27bd (patch)
tree3c4fb2e22d2837dfd97016da0695316d6fce8940 /tests/component/deb/test_import_dsc.py
parent93993909554442af009285c3866d4bf7b7c5da13 (diff)
import_dsc: Make 'gbp import-dsc' aware of component tarballs
instead of plain failing just import the additional tarball but disable pristine-tar until we sorted out how to export things again. Closes: #561072
Diffstat (limited to 'tests/component/deb/test_import_dsc.py')
-rw-r--r--tests/component/deb/test_import_dsc.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/component/deb/test_import_dsc.py b/tests/component/deb/test_import_dsc.py
index 760b365..7a82ce0 100644
--- a/tests/component/deb/test_import_dsc.py
+++ b/tests/component/deb/test_import_dsc.py
@@ -97,8 +97,16 @@ class TestImportDsc(ComponentTestBase):
'--pristine-tar',
'--debian-branch=master',
'--upstream-branch=upstream',
- dsc]) == 1
- self._check_log(0, "gbp:error: Cannot import package with additional tarballs but found 'hello-debhelper_2.8.orig-foo.tar.gz")
+ dsc]) == 0
+ repo = ComponentTestGitRepository('hello-debhelper')
+ self._check_repo_state(repo, 'master', ['master', 'upstream'])
+ commits, expected = len(repo.get_commits()), 2
+
+ for file in ['foo/test1', 'foo/test2']:
+ ok_(file in repo.ls_tree('HEAD'),
+ "Could not find component tarball file %s in %s" % (file, repo.ls_tree('HEAD')))
+
+ ok_(commits == expected, "Found %d commit instead of %d" % (commits, expected))
def test_existing_dir(self):
"""