diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2018-09-18 13:49:37 +0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-09-20 12:46:26 +0200 |
| commit | a656995e942042cb2bdfa224ddeb8cd54e27694a (patch) | |
| tree | 1a6147e3e83d824932b9ec0d2d366f46762b9a37 /tests | |
| parent | 2f6a4324b1f70f815e35d9c32dee6818dbca4072 (diff) | |
tests: small fix for import-orig-rpm component test
Merge behaviour in newer git versions (> v2.16) is slightly different.
This broke one test with an error something like:
Traceback (most recent call last):
File "tests/component/rpm/test_import_orig_rpm.py", line 243, in test_misc_options
eq_(len(repo.get_commits(until='pack')), 3)
AssertionError: 2 != 3
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/rpm/test_import_orig_rpm.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/component/rpm/test_import_orig_rpm.py b/tests/component/rpm/test_import_orig_rpm.py index c27601db..5ed41c61 100644 --- a/tests/component/rpm/test_import_orig_rpm.py +++ b/tests/component/rpm/test_import_orig_rpm.py @@ -222,6 +222,10 @@ class TestImportOrig(ImportOrigTestBase): def test_misc_options(self): """Test various options of git-import-orig-rpm""" repo = ComponentTestGitRepository.create('.') + # Force --no-ff for merges because default behavior is slightly + # different in newer git versions (> 2.16) + repo.set_config("branch.pack.mergeoptions", "--no-ff") + # Import one orig with default options to get upstream and # packaging branch orig = os.path.join(DATA_DIR, 'gbp-test-1.0.tar.bz2') |