aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-10-09 11:30:32 +0200
committerGuido Günther <agx@sigxcpu.org>2016-10-09 13:14:11 +0200
commit55e8c8fa32972402d47e9e83df5a8bfa663ce825 (patch)
treec1c193b9215faf7f2b518ed1dfa94a9fcc4f1576 /tests
parent53f9f401245195d385f024f71695674fe61f6602 (diff)
GitRepository.list_submodules: use _git_inout
and check exit status This silences another spurious output to stderr in test_buildpackage_rpm and makes sure we fail on the first operation on the nonexistent tree (repo.list_submodules) instead of the second (repo.archive) since the former ignored the exit status so far.
Diffstat (limited to 'tests')
-rw-r--r--tests/component/rpm/test_buildpackage_rpm.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/component/rpm/test_buildpackage_rpm.py b/tests/component/rpm/test_buildpackage_rpm.py
index 7658ff47..71ff7b77 100644
--- a/tests/component/rpm/test_buildpackage_rpm.py
+++ b/tests/component/rpm/test_buildpackage_rpm.py
@@ -400,7 +400,8 @@ class TestGbpRpm(RpmRepoTestBase):
upstr_branch, '--git-ignore-new']), 2)
self._check_log(-2,
".*Error generating submodules' archives: "
- "Unable to archive [0-9a-f]+: fatal: not a tree object")
+ "Failed to list submodules of [0-9a-f]{40}: fatal: "
+ "not a tree object")
def test_option_submodules_native(self):
"""Test the --git-submodules option for native packages"""