1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
# Copyright (C) 2007 by Jelmer Vernooij
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Couple of blackbox tests for the rebase plugin."""
from bzrlib.tests.blackbox import ExternalBase
import os
class TestRebaseSimple(ExternalBase):
def make_file(self, name, contents):
f = open(name, 'wb')
try:
f.write(contents)
finally:
f.close()
def setUp(self):
super(TestRebaseSimple, self).setUp()
os.mkdir('main')
os.chdir('main')
self.run_bzr('init')
self.make_file('hello', "hi world")
self.run_bzr('add')
self.run_bzr('commit -m bla')
self.run_bzr('branch . ../feature')
def test_notneeded(self):
os.chdir('../feature')
self.run_bzr_error(['bzr: ERROR: Already rebased on .*'],
'rebase ../main')
def test_simple_success(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.check_output('', 'rebase ../main')
self.check_output('3\n', 'revno')
def test_conflicting(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hello', "other data")
self.run_bzr('commit -m this')
self.run_bzr_error('Text conflict in hello\nbzr: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run \'bzr rebase-continue\' or run \'bzr rebase-abort\'.\n', 'rebase ../main')
def test_conflicting_abort(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hello', "other data")
self.run_bzr('commit -m this')
old_log = self.run_bzr('log')[0]
self.run_bzr_error('Text conflict in hello\nbzr: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run \'bzr rebase-continue\' or run \'bzr rebase-abort\'.\n', 'rebase ../main')
self.check_output('', 'rebase-abort')
self.check_output(old_log, 'log')
def test_conflicting_continue(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hello', "other data")
self.run_bzr('commit -m this')
self.run_bzr_error('Text conflict in hello\nbzr: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run \'bzr rebase-continue\' or run \'bzr rebase-abort\'.\n', 'rebase ../main')
self.run_bzr('resolved hello')
self.check_output('', 'rebase-continue')
self.check_output('3\n', 'revno')
def test_continue_nothing(self):
self.run_bzr_error('bzr: ERROR: No rebase to continue',
'rebase-continue')
def test_abort_nothing(self):
self.run_bzr_error('bzr: ERROR: No rebase to abort',
'rebase-abort')
def test_todo_nothing(self):
self.run_bzr_error('bzr: ERROR: No rebase in progress',
'rebase-todo')
def test_onto(self):
self.make_file('hello', '42')
self.run_bzr('add')
self.run_bzr('commit -m that')
self.make_file('other', '43')
self.run_bzr('add')
self.run_bzr('commit -m that_other')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.check_output('', 'rebase --onto -2 ../main')
self.check_output('3\n', 'revno')
def test_verbose(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
out, err = self.run_bzr('rebase -v ../main')
self.assertContainsRe(err, ' -> ')
self.assertEqual('', out)
self.check_output('3\n', 'revno')
|