← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2013-08-20 03:02:43 UTC
  • Revision ID: aaron@aaronbentley.com-20130820030243-r8v1xfbcnd8f10p4
Fix zap command for 2.6/7

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/blackbox.py
5
5
from bzrlib import branch, osutils, workingtree
6
6
from bzrlib.config import LocationConfig
7
7
from bzrlib.transport import get_transport
8
 
from bzrlib.tests import TestCaseWithTransport, HardlinkFeature
 
8
from bzrlib.tests import (
 
9
    TestCaseWithTransport,
 
10
    )
 
11
from bzrlib.plugins.bzrtools import command
 
12
 
 
13
try:
 
14
    from bzrlib.tests.features import (
 
15
        HardlinkFeature,
 
16
        ModuleAvailableFeature,
 
17
        )
 
18
except ImportError: # bzr < 2.5
 
19
    from bzrlib.tests import (
 
20
        HardlinkFeature,
 
21
        ModuleAvailableFeature,
 
22
        )
 
23
 
 
24
 
 
25
LzmaFeature = ModuleAvailableFeature("lzma")
9
26
 
10
27
 
11
28
class TestBzrTools(TestCaseWithTransport):
 
29
 
 
30
    def setUp(self):
 
31
        TestCaseWithTransport.setUp(self)
 
32
        command._testing = True
 
33
        self.addCleanup(command._stop_testing)
 
34
 
12
35
    @staticmethod
13
36
    def touch(filename):
14
37
        file(filename, 'wb').write('')
26
49
        self.run_bzr('init')
27
50
        self.run_bzr('fetch-ghosts .')
28
51
 
 
52
    def test_fetch_ghosts_with_saved(self):
 
53
        wt = self.make_branch_and_tree('.')
 
54
        wt.branch.set_parent('.')
 
55
        self.run_bzr('fetch-ghosts')
 
56
 
29
57
    def test_patch(self):
30
58
        self.run_bzr('init')
31
59
        file('myfile', 'wb').write('hello')
76
104
        checkout.add('file')
77
105
        self.run_bzr_error(('This checkout has uncommitted changes',),
78
106
                           'zap checkout')
79
 
        self.failUnlessExists('checkout')
 
107
        self.assertPathExists('checkout')
80
108
        self.run_bzr('zap checkout --force')
81
 
        self.failIfExists('checkout')
82
 
        self.failUnlessExists('source')
 
109
        self.assertPathDoesNotExist('checkout')
 
110
        self.assertPathExists('source')
83
111
 
84
112
    def test_zap_branch(self):
85
113
        self.run_bzr('init source')
93
121
        self.assertIs(False, os.path.exists('checkout2'))
94
122
        self.assertIs(False, os.path.exists('source2'))
95
123
 
96
 
    def test_branches(self):
 
124
    def test_list_branches(self):
97
125
        self.run_bzr('init source')
98
126
        self.run_bzr('init source/subsource')
99
127
        self.run_bzr('checkout --lightweight source checkout')
100
128
        self.run_bzr('init checkout/subcheckout')
101
129
        self.run_bzr('init checkout/.bzr/subcheckout')
102
 
        out = self.run_bzr('branches')[0]
 
130
        out = self.run_bzr('list-branches')[0]
103
131
        lines = out.split('\n')
104
132
        self.assertIs(True, 'source' in lines)
105
133
        self.assertIs(True, 'source/subsource' in lines)
121
149
        self.run_bzr('init ../import')
122
150
        os.chdir('../import')
123
151
        self.run_bzr('import ../source-0.1.tar.gz')
124
 
        self.failUnlessExists('src/myfile')
 
152
        self.assertPathExists('src/myfile')
125
153
        result = self.run_bzr('import ../source-0.1.tar.gz', retcode=3)[1]
126
154
        self.assertContainsRe(result, 'Working tree has uncommitted changes')
127
155
        self.run_bzr('commit -m commit')
129
157
        os.chdir('..')
130
158
        self.run_bzr('init import2')
131
159
        self.run_bzr('import source-0.1.tar.gz import2')
132
 
        self.failUnlessExists('import2/src/myfile')
 
160
        self.assertPathExists('import2/src/myfile')
133
161
        self.run_bzr('import source-0.1.tar.gz import3')
134
 
        self.failUnlessExists('import3/src/myfile')
 
162
        self.assertPathExists('import3/src/myfile')
135
163
        self.run_bzr('import source-0.1.tar.bz2 import4')
136
 
        self.failUnlessExists('import4/src/myfile')
 
164
        self.assertPathExists('import4/src/myfile')
137
165
        self.run_bzr('import source-0.1 import5')
138
 
        self.failUnlessExists('import5/src/myfile')
 
166
        self.assertPathExists('import5/src/myfile')
 
167
 
 
168
    def test_import_upstream_lzma(self):
 
169
        self.requireFeature(LzmaFeature)
 
170
        self.run_bzr('init source')
 
171
        os.mkdir('source/src')
 
172
        f = file('source/src/myfile', 'wb')
 
173
        f.write('hello?')
 
174
        f.close()
 
175
        os.chdir('source')
 
176
        self.run_bzr('add')
 
177
        self.run_bzr('commit -m hello')
 
178
        self.run_bzr('export ../source-0.1.tar.lzma')
 
179
        self.run_bzr('export ../source-0.1.tar.xz')
 
180
        os.chdir('..')
 
181
        self.run_bzr('import source-0.1.tar.lzma import1')
 
182
        self.assertPathExists('import1/src/myfile')
 
183
        self.run_bzr('import source-0.1.tar.xz import2')
 
184
        self.assertPathExists('import2/src/myfile')
139
185
 
140
186
    def test_cbranch(self):
141
187
        source = self.make_branch_and_tree('source')
152
198
 
153
199
    def test_cbranch_hardlink(self):
154
200
        self.requireFeature(HardlinkFeature)
155
 
        source = self.make_branch_and_tree('source')
 
201
        # Later formats don't support hardlinks.  Boo!
 
202
        source = self.make_branch_and_tree('source', format='1.9')
156
203
        self.build_tree(['source/file'])
157
204
        source.add('file')
158
205
        source.commit('added file')
169
216
        self.assertEqual(os.lstat(checkout2.abspath('file')).st_ino,
170
217
                         os.lstat(source.abspath('file')).st_ino)
171
218
 
 
219
    def test_create_mirror(self):
 
220
        source = self.make_branch_and_tree('source')
 
221
        source.commit('message')
 
222
        self.run_bzr('create-mirror source target')
 
223
        target = branch.Branch.open('target')
 
224
        self.assertEqual(source.last_revision(), target.last_revision())
 
225
        self.assertEqual(source.branch.base, target.get_public_branch())
 
226
 
172
227
 
173
228
def test_suite():
174
229
    return makeSuite(TestBzrTools)