Breezy

Merge lp:~jelmer/brz/no-dpush into lp:brz

  1. no-dpush
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/no-dpush
Merge into: lp:brz
Diff against target: 33 lines (+0/-23)
1 file modified
breezy/plugins/git/tests/test_blackbox.py (+0/-23)
To merge this branch: bzr merge lp:~jelmer/brz/no-dpush
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+345331@code.launchpad.net

Commit message

Drop two broken dpush tests (dpush has been removed).

Description of the change

Drop two broken dpush tests (dpush has been removed).

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/git/tests/test_blackbox.py'
2--- breezy/plugins/git/tests/test_blackbox.py 2018-04-08 17:06:15 +0000
3+++ breezy/plugins/git/tests/test_blackbox.py 2018-05-10 01:52:10 +0000
4@@ -265,29 +265,6 @@
5 self.assertTrue("refs/tags/atag -> " in stdout)
6 self.assertTrue("HEAD -> " in stdout)
7
8- def test_dpush(self):
9- r = GitRepo.init("gitr", mkdir=True)
10- self.build_tree_contents([("gitr/foo", "hello from git")])
11- r.stage("foo")
12- r.do_commit("message", committer="Somebody <user@example.com>")
13- self.run_bzr(["init", "--format=default", "bzrb"])
14- self.run_bzr(["pull", "gitr", "-d", "bzrb"])
15- self.build_tree_contents([("bzrb/foo", "hello from bzr")])
16- self.run_bzr(["commit", "-m", "msg", "bzrb"])
17- self.run_bzr(["dpush", "-d", "bzrb", "gitr"])
18-
19- def test_dpush_from_bound(self):
20- r = GitRepo.init("gitr", mkdir=True)
21- self.build_tree_contents([("gitr/foo", "hello from git")])
22- r.stage("foo")
23- r.do_commit("message", committer="Somebody <user@example.com>")
24- self.run_bzr(["init", "--format=default", "bzrm"])
25- self.run_bzr(["pull", "gitr", "-d", "bzrm"])
26- self.run_bzr(["checkout", "bzrm", "bzrb"])
27- self.build_tree_contents([("bzrb/foo", "hello from bzr")])
28- self.run_bzr(["commit", "-m", "msg", "bzrb"])
29- self.run_bzr(["dpush", "-d", "bzrb", "gitr"])
30-
31 def test_check(self):
32 r = GitRepo.init("gitr", mkdir=True)
33 self.build_tree_contents([("gitr/foo", "hello from git")])

Subscribers

People subscribed via source and target branches