Show More
@@ -226,7 +226,7 b' class TestCompareController:' | |||
|
226 | 226 | |
|
227 | 227 | response.mustcontain("Repositories unrelated.") |
|
228 | 228 | |
|
229 |
@pytest.mark.xfail_backends("svn" |
|
|
229 | @pytest.mark.xfail_backends("svn") | |
|
230 | 230 | def test_compare_cherry_pick_commits_from_bottom(self, backend): |
|
231 | 231 | |
|
232 | 232 | # repo1: |
@@ -277,10 +277,10 b' class TestCompareController:' | |||
|
277 | 277 | repo_name=repo2.repo_name, |
|
278 | 278 | source_ref_type="rev", |
|
279 | 279 | # parent of commit2, in target repo2 |
|
280 |
source_ref=commit1. |
|
|
280 | source_ref=commit1.raw_id, | |
|
281 | 281 | target_repo=repo1.repo_name, |
|
282 | 282 | target_ref_type="rev", |
|
283 |
target_ref=commit4. |
|
|
283 | target_ref=commit4.raw_id, | |
|
284 | 284 | merge='1',)) |
|
285 | 285 | response.mustcontain('%s@%s' % (repo2.repo_name, commit1.short_id)) |
|
286 | 286 | response.mustcontain('%s@%s' % (repo1.repo_name, commit4.short_id)) |
@@ -293,7 +293,7 b' class TestCompareController:' | |||
|
293 | 293 | ('file1', 'a_c--826e8142e6ba'), |
|
294 | 294 | ]) |
|
295 | 295 | |
|
296 |
@pytest.mark.xfail_backends("svn" |
|
|
296 | @pytest.mark.xfail_backends("svn") | |
|
297 | 297 | def test_compare_cherry_pick_commits_from_top(self, backend): |
|
298 | 298 | # repo1: |
|
299 | 299 | # commit0: |
@@ -343,9 +343,9 b' class TestCompareController:' | |||
|
343 | 343 | repo_name=repo1.repo_name, |
|
344 | 344 | source_ref_type="rev", |
|
345 | 345 | # parent of commit3, not in source repo2 |
|
346 |
source_ref=commit2. |
|
|
346 | source_ref=commit2.raw_id, | |
|
347 | 347 | target_ref_type="rev", |
|
348 |
target_ref=commit5. |
|
|
348 | target_ref=commit5.raw_id, | |
|
349 | 349 | merge='1',)) |
|
350 | 350 | |
|
351 | 351 | response.mustcontain('%s@%s' % (repo1.repo_name, commit2.short_id)) |
General Comments 0
You need to be logged in to leave comments.
Login now