brz-git

Merge lp:~jelmer/brz-git/update-xfail into lp:brz-git

  1. update-xfail
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1896
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz-git/update-xfail
Merge into: lp:brz-git
Diff against target: 55 lines (+0/-37)
1 file modified
xfail (+0/-37)
To merge this branch: bzr merge lp:~jelmer/brz-git/update-xfail
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+342163@code.launchpad.net

Commit message

Update xfail.

Description of the change

Update xfail.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-git-dev/122/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'xfail'
2--- xfail 2018-03-26 00:30:51 +0000
3+++ xfail 2018-03-27 01:27:30 +0000
4@@ -1,30 +1,3 @@
5-breezy.tests.per_branch.test_create_clone.TestCreateClone.test_create_clone_of_multiple_roots(LocalGitBranchFormat)
6-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(LocalGitBranchFormat)
7-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(LocalGitBranchFormat)
8-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_with_different_depths_merge(LocalGitBranchFormat)
9-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_forward(LocalGitBranchFormat)
10-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted(LocalGitBranchFormat)
11-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(LocalGitBranchFormat)
12-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(LocalGitBranchFormat)
13-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(LocalGitBranchFormat)
14-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(LocalGitBranchFormat)
15-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(LocalGitBranchFormat)
16-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(LocalGitBranchFormat)
17-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(LocalGitBranchFormat)
18-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(LocalGitBranchFormat)
19-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(LocalGitBranchFormat)
20-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(LocalGitBranchFormat)
21-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(LocalGitBranchFormat)
22-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(LocalGitBranchFormat)
23-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(LocalGitBranchFormat)
24-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(LocalGitBranchFormat)
25-breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(LocalGitBranchFormat)
26-breezy.tests.per_interbranch.test_push.TestPush.test_no_get_parent_map_after_insert_stream(InterFromGitBranch,LocalGitBranchFormat,BzrBranchFormat7)
27-breezy.tests.per_interbranch.test_push.TestPush.test_no_get_parent_map_after_insert_stream(InterGitLocalGitBranch,LocalGitBranchFormat,LocalGitBranchFormat)
28-breezy.tests.per_interbranch.test_push.TestPush.test_no_get_parent_map_after_insert_stream(InterLocalGitRemoteGitBranch,LocalGitBranchFormat,RemoteGitBranchFormat)
29-breezy.tests.per_interbranch.test_push.TestPush.test_push_with_default_stacking_does_not_create_broken_branch(InterFromGitBranch,LocalGitBranchFormat,BzrBranchFormat7)
30-breezy.tests.per_interbranch.test_push.TestPush.test_push_with_default_stacking_does_not_create_broken_branch(InterGitLocalGitBranch,LocalGitBranchFormat,LocalGitBranchFormat)
31-breezy.tests.per_interbranch.test_push.TestPush.test_push_with_default_stacking_does_not_create_broken_branch(InterLocalGitRemoteGitBranch,LocalGitBranchFormat,RemoteGitBranchFormat)
32 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(GitRepositoryFormat)
33 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(GitRepositoryFormat)
34 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_merge_file_changes(GitRepositoryFormat)
35@@ -32,14 +5,6 @@
36 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_merge_new_file_unchanged(GitRepositoryFormat)
37 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_merge_new_link_unchanged(GitRepositoryFormat)
38 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_reparent_dir_changes(GitRepositoryFormat)
39-breezy.tests.per_repository.test_repository.TestRepository.test_add_signature_text(GitRepositoryFormat)
40-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_merge_parent_no_file(GitWorkingTreeFormat)
41-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_merge_parents(GitWorkingTreeFormat)
42-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_merge_parent_was_directory(GitWorkingTreeFormat)
43-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_mod_from_parent(GitWorkingTreeFormat)
44-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_same_as_merge_parent(GitWorkingTreeFormat)
45-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_same_as_merge_parent_supersedes(GitWorkingTreeFormat)
46-breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_same_as_parent(GitWorkingTreeFormat)
47 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(GitWorkingTreeFormat)
48 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(GitWorkingTreeFormat)
49 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(GitWorkingTreeFormat)
50@@ -48,5 +13,3 @@
51 breezy.tests.per_workingtree.test_walkdirs.TestWalkdirs.test_walkdir_missings(GitWorkingTreeFormat)
52 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_preserves_content(GitWorkingTreeFormat)
53 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(GitWorkingTreeFormat)
54-breezy.tests.per_workingtree.test_workingtree.TestWorkingTreeUpdate.test_update_remove_commit(GitWorkingTreeFormat)
55-breezy.tests.per_workingtree.test_workingtree.TestWorkingTreeUpdate.test_update_revision(GitWorkingTreeFormat)

Subscribers

People subscribed via source and target branches

to all changes: