diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-09-15 10:29:07 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-09-15 12:50:11 +0200 |
| commit | 6abb9e8bf06dfc582fa38b1895a47b25b02c55da (patch) | |
| tree | a60fb54bdbba0f22e73166024cabf2bea4f4f9ac /tests/22_test_gbp_buildpackage.py | |
| parent | 65a043dbf8662e465365543711510d02e0c87c21 (diff) | |
buildpackage: don't require debian/ prefix for --git-dist=DEP14 to work
Diffstat (limited to 'tests/22_test_gbp_buildpackage.py')
| -rw-r--r-- | tests/22_test_gbp_buildpackage.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/22_test_gbp_buildpackage.py b/tests/22_test_gbp_buildpackage.py index 35f95700..9f7eca6a 100644 --- a/tests/22_test_gbp_buildpackage.py +++ b/tests/22_test_gbp_buildpackage.py @@ -69,13 +69,20 @@ class TestGbpBuildpackageDep14(DebianGitTestRepo): self.assertEqual(get_pbuilder_dist(self.options, self.repo), 'downstream_mies-lts') @patch('gbp.deb.get_vendor', return_value='Debian') - def test_get_pbuilder_dist_dep14_no_vendor(self, patch): + def test_get_pbuilder_dist_dep14_no_vendor_sid(self, patch): branch = 'sid' self.repo.create_branch(branch) self.repo.set_branch(branch) - with self.assertRaisesRegexp(GbpError, - "DEP14 DIST: Current branch 'sid' does not match vendor/suite"): - get_pbuilder_dist(self.options, self.repo) + self.assertEqual(get_pbuilder_dist(self.options, self.repo), '') + patch.assert_called_once_with() + + @patch('gbp.deb.get_vendor', return_value='Debian') + def test_get_pbuilder_dist_dep14_no_vendor(self, patch): + branch = 'wheezy' + self.repo.create_branch(branch) + self.repo.set_branch(branch) + self.assertEqual(get_pbuilder_dist(self.options, self.repo), 'wheezy') + patch.assert_called_once_with() def test_get_pbuilder_dist_dep14_too_many_slashes(self): branch = 'too/many/slashes' |