diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-02-11 10:18:47 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:47:20 +0200 |
| commit | c977df22678e9bb220afa86bbc5edcbf39acb048 (patch) | |
| tree | 306fbbe15aba45de127be29ff99433da9ef846ab /tests | |
| parent | 0342b355586da7f21f9858cc3eb59f7aee0de3dd (diff) | |
| download | git-buildpackage-c977df22678e9bb220afa86bbc5edcbf39acb048.tar.gz git-buildpackage-c977df22678e9bb220afa86bbc5edcbf39acb048.tar.bz2 git-buildpackage-c977df22678e9bb220afa86bbc5edcbf39acb048.zip | |
pq-rpm: implement --new-packaging-dir cmdline option
Used for setting the packaging directory to be used in the new orphan
packaging branch. Defaults to --packaging-dir so that the gbp.conf files
are more likely to work without modification.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/rpm/test_pq_rpm.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py index 69b760f4..1bc15d52 100644 --- a/tests/component/rpm/test_pq_rpm.py +++ b/tests/component/rpm/test_pq_rpm.py @@ -256,15 +256,16 @@ class TestPqRpm(RpmRepoTestBase): """Basic test for convert action""" repo = self.init_test_repo('gbp-test2') branches = repo.get_local_branches() + ['master-orphan'] - files = ['bar.tar.gz', 'foo.txt', 'gbp-test2.spec', - 'gbp-test2-alt.spec', 'my.patch', '0001-My-addition.patch'] - + files = ['packaging/', 'packaging/bar.tar.gz', 'packaging/foo.txt', + 'packaging/gbp-test2.spec', 'packaging/gbp-test2-alt.spec', + 'packaging/my.patch', 'packaging/0001-My-addition.patch', + '.gbp.conf'] # First should fail because 'master-orphan' branch already exists eq_(mock_pq(['convert']), 1) self._check_log(-1, "gbp:error: Branch 'master-orphan' already exists") # Re-try with force - eq_(mock_pq(['convert', '--import-files=', '--force']), 0) + eq_(mock_pq(['convert', '--force']), 0) self._check_repo_state(repo, 'master-orphan', branches, files) def test_convert_fail(self): @@ -520,6 +521,20 @@ class TestPqRpm(RpmRepoTestBase): ok_('debian/gbp.conf' not in repo.list_files()) ok_('.gbp.conf' not in repo.list_files()) + def test_option_new_packaging_dir(self): + """Test the --new-packaging-dir cmdline option""" + repo = self.init_test_repo('gbp-test2') + branches = repo.get_local_branches() + ['master-orphan'] + files = ['rpm/', 'rpm/bar.tar.gz', 'rpm/foo.txt', + 'rpm/gbp-test2.spec', 'rpm/gbp-test2-alt.spec', + 'rpm/my.patch', 'rpm/0001-My-addition.patch'] + # Drop already-existing master-orphan branch + repo.delete_branch('master-orphan') + # Try convert + eq_(mock_pq(['convert', '--import-files=', + '--new-packaging-dir=rpm']), 0) + self._check_repo_state(repo, 'master-orphan', branches, files) + def test_import_unapplicable_patch(self): """Test import when a patch does not apply""" repo = self.init_test_repo('gbp-test') |