/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
1
# Copyright (C) 2004, 2005 by Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
18
import os
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
19
import sys
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
20
import stat
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
21
from cStringIO import StringIO
1442.1.44 by Robert Collins
Many transport related tweaks:
22
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
23
from bzrlib.errors import (NoSuchFile, FileExists,
24
                           TransportNotPossible, ConnectionError)
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
25
from bzrlib.tests import TestCase, TestCaseInTempDir
26
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
1469 by Robert Collins
Change Transport.* to work with URL's.
27
from bzrlib.transport import memory, urlescape
1185.31.33 by John Arbash Meinel
A couple more path.join statements needed changing.
28
from bzrlib.osutils import pathjoin
1442.1.44 by Robert Collins
Many transport related tweaks:
29
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
30
31
def _append(fn, txt):
32
    """Append the given text (file-like object) to the supplied filename."""
33
    f = open(fn, 'ab')
34
    f.write(txt)
35
    f.flush()
36
    f.close()
37
    del f
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
38
1469 by Robert Collins
Change Transport.* to work with URL's.
39
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
40
if sys.platform != 'win32':
41
    def check_mode(test, path, mode):
42
        """Check that a particular path has the correct mode."""
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
43
        actual_mode = stat.S_IMODE(os.stat(path).st_mode)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
44
        test.assertEqual(mode, actual_mode,
45
            'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
46
else:
47
    def check_mode(test, path, mode):
48
        """On win32 chmod doesn't have any effect, 
49
        so don't actually check anything
50
        """
51
        return
52
53
1185.58.3 by John Arbash Meinel
code cleanup
54
class TestTransport(TestCase):
55
    """Test the non transport-concrete class functionality."""
56
57
    def test_urlescape(self):
58
        self.assertEqual('%25', urlescape('%'))
59
1469 by Robert Collins
Change Transport.* to work with URL's.
60
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
61
class TestTransportMixIn(object):
62
    """Subclass this, and it will provide a series of tests for a Transport.
63
    It assumes that the Transport object is connected to the 
64
    current working directory.  So that whatever is done 
65
    through the transport, should show up in the working 
66
    directory, and vice-versa.
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
67
68
    This also tests to make sure that the functions work with both
69
    generators and lists (assuming iter(list) is effectively a generator)
70
    """
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
71
    readonly = False
72
    def get_transport(self):
73
        """Children should override this to return the Transport object.
74
        """
75
        raise NotImplementedError
76
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
77
    def assertListRaises(self, excClass, func, *args, **kwargs):
78
        """Many transport functions can return generators this makes sure
79
        to wrap them in a list() call to make sure the whole generator
80
        is run, and that the proper exception is raised.
81
        """
82
        try:
83
            list(func(*args, **kwargs))
84
        except excClass:
85
            return
86
        else:
87
            if hasattr(excClass,'__name__'): excName = excClass.__name__
88
            else: excName = str(excClass)
89
            raise self.failureException, "%s not raised" % excName
90
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
91
    def test_has(self):
92
        t = self.get_transport()
93
1469 by Robert Collins
Change Transport.* to work with URL's.
94
        files = ['a', 'b', 'e', 'g', '%']
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
95
        self.build_tree(files)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
96
        self.assertEqual(True, t.has('a'))
97
        self.assertEqual(False, t.has('c'))
98
        self.assertEqual(True, t.has(urlescape('%')))
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
99
        self.assertEqual(list(t.has_multi(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'])),
100
                [True, True, False, False, True, False, True, False])
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
101
        self.assertEqual(True, t.has_any(['a', 'b', 'c']))
102
        self.assertEqual(False, t.has_any(['c', 'd', 'f', urlescape('%%')]))
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
103
        self.assertEqual(list(t.has_multi(iter(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']))),
104
                [True, True, False, False, True, False, True, False])
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
105
        self.assertEqual(False, t.has_any(['c', 'c', 'c']))
106
        self.assertEqual(True, t.has_any(['b', 'b', 'b']))
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
107
108
    def test_get(self):
109
        t = self.get_transport()
110
111
        files = ['a', 'b', 'e', 'g']
112
        self.build_tree(files)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
113
        self.assertEqual(open('a', 'rb').read(), t.get('a').read())
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
114
        content_f = t.get_multi(files)
115
        for path,f in zip(files, content_f):
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
116
            self.assertEqual(f.read(), open(path, 'rb').read())
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
117
118
        content_f = t.get_multi(iter(files))
119
        for path,f in zip(files, content_f):
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
120
            self.assertEqual(f.read(), open(path, 'rb').read())
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
121
122
        self.assertRaises(NoSuchFile, t.get, 'c')
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
123
        self.assertListRaises(NoSuchFile, t.get_multi, ['a', 'b', 'c'])
124
        self.assertListRaises(NoSuchFile, t.get_multi, iter(['a', 'b', 'c']))
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
125
126
    def test_put(self):
127
        t = self.get_transport()
128
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
129
        # TODO: jam 20051215 No need to do anything if the test is readonly
130
        #                    origininally it was thought that it would give
131
        #                    more of a workout to readonly tests. By now the
132
        #                    suite is probably thorough enough without testing
133
        #                    readonly protocols in write sections
134
        #                    The only thing that needs to be tested is that the
135
        #                    right error is raised
136
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
137
        if self.readonly:
138
            self.assertRaises(TransportNotPossible,
139
                    t.put, 'a', 'some text for a\n')
140
            open('a', 'wb').write('some text for a\n')
141
        else:
142
            t.put('a', 'some text for a\n')
143
        self.assert_(os.path.exists('a'))
144
        self.check_file_contents('a', 'some text for a\n')
145
        self.assertEqual(t.get('a').read(), 'some text for a\n')
146
        # Make sure 'has' is updated
147
        self.assertEqual(list(t.has_multi(['a', 'b', 'c', 'd', 'e'])),
148
                [True, False, False, False, False])
149
        if self.readonly:
150
            self.assertRaises(TransportNotPossible,
151
                    t.put_multi,
152
                    [('a', 'new\ncontents for\na\n'),
153
                        ('d', 'contents\nfor d\n')])
154
            open('a', 'wb').write('new\ncontents for\na\n')
155
            open('d', 'wb').write('contents\nfor d\n')
156
        else:
157
            # Put also replaces contents
158
            self.assertEqual(t.put_multi([('a', 'new\ncontents for\na\n'),
159
                                          ('d', 'contents\nfor d\n')]),
160
                             2)
161
        self.assertEqual(list(t.has_multi(['a', 'b', 'c', 'd', 'e'])),
162
                [True, False, False, True, False])
163
        self.check_file_contents('a', 'new\ncontents for\na\n')
164
        self.check_file_contents('d', 'contents\nfor d\n')
165
166
        if self.readonly:
167
            self.assertRaises(TransportNotPossible,
168
                t.put_multi, iter([('a', 'diff\ncontents for\na\n'),
169
                                  ('d', 'another contents\nfor d\n')]))
170
            open('a', 'wb').write('diff\ncontents for\na\n')
171
            open('d', 'wb').write('another contents\nfor d\n')
172
        else:
173
            self.assertEqual(
174
                t.put_multi(iter([('a', 'diff\ncontents for\na\n'),
175
                                  ('d', 'another contents\nfor d\n')]))
176
                             , 2)
177
        self.check_file_contents('a', 'diff\ncontents for\na\n')
178
        self.check_file_contents('d', 'another contents\nfor d\n')
179
180
        if self.readonly:
181
            self.assertRaises(TransportNotPossible,
182
                    t.put, 'path/doesnt/exist/c', 'contents')
183
        else:
184
            self.assertRaises(NoSuchFile,
185
                    t.put, 'path/doesnt/exist/c', 'contents')
186
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
187
        if not self.readonly:
188
            t.put('mode644', 'test text\n', mode=0644)
189
            check_mode(self, 'mode644', 0644)
190
191
            t.put('mode666', 'test text\n', mode=0666)
192
            check_mode(self, 'mode666', 0666)
193
194
            t.put('mode600', 'test text\n', mode=0600)
195
            check_mode(self, 'mode600', 0600)
196
197
            # Yes, you can put a file such that it becomes readonly
198
            t.put('mode400', 'test text\n', mode=0400)
199
            check_mode(self, 'mode400', 0400)
200
201
            t.put_multi([('mmode644', 'text\n')], mode=0644)
202
            check_mode(self, 'mmode644', 0644)
203
204
        # TODO: jam 20051215 test put_multi with a mode. I didn't bother because
205
        #                    it seems most people don't like the _multi functions
206
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
207
    def test_put_file(self):
208
        t = self.get_transport()
209
210
        # Test that StringIO can be used as a file-like object with put
211
        f1 = StringIO('this is a string\nand some more stuff\n')
212
        if self.readonly:
213
            open('f1', 'wb').write(f1.read())
214
        else:
215
            t.put('f1', f1)
216
217
        del f1
218
219
        self.check_file_contents('f1', 
220
                'this is a string\nand some more stuff\n')
221
222
        f2 = StringIO('here is some text\nand a bit more\n')
223
        f3 = StringIO('some text for the\nthird file created\n')
224
225
        if self.readonly:
226
            open('f2', 'wb').write(f2.read())
227
            open('f3', 'wb').write(f3.read())
228
        else:
229
            t.put_multi([('f2', f2), ('f3', f3)])
230
231
        del f2, f3
232
233
        self.check_file_contents('f2', 'here is some text\nand a bit more\n')
234
        self.check_file_contents('f3', 'some text for the\nthird file created\n')
235
236
        # Test that an actual file object can be used with put
237
        f4 = open('f1', 'rb')
238
        if self.readonly:
239
            open('f4', 'wb').write(f4.read())
240
        else:
241
            t.put('f4', f4)
242
243
        del f4
244
245
        self.check_file_contents('f4', 
246
                'this is a string\nand some more stuff\n')
247
248
        f5 = open('f2', 'rb')
249
        f6 = open('f3', 'rb')
250
        if self.readonly:
251
            open('f5', 'wb').write(f5.read())
252
            open('f6', 'wb').write(f6.read())
253
        else:
254
            t.put_multi([('f5', f5), ('f6', f6)])
255
256
        del f5, f6
257
258
        self.check_file_contents('f5', 'here is some text\nand a bit more\n')
259
        self.check_file_contents('f6', 'some text for the\nthird file created\n')
260
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
261
        if not self.readonly:
262
            sio = StringIO('test text\n')
263
            t.put('mode644', sio, mode=0644)
264
            check_mode(self, 'mode644', 0644)
265
266
            a = open('mode644', 'rb')
267
            t.put('mode666', a, mode=0666)
268
            check_mode(self, 'mode666', 0666)
269
270
            a = open('mode644', 'rb')
271
            t.put('mode600', a, mode=0600)
272
            check_mode(self, 'mode600', 0600)
273
274
            # Yes, you can put a file such that it becomes readonly
275
            a = open('mode644', 'rb')
276
            t.put('mode400', a, mode=0400)
277
            check_mode(self, 'mode400', 0400)
278
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
279
    def test_mkdir(self):
280
        t = self.get_transport()
281
282
        # Test mkdir
283
        os.mkdir('dir_a')
284
        self.assertEqual(t.has('dir_a'), True)
285
        self.assertEqual(t.has('dir_b'), False)
286
287
        if self.readonly:
288
            self.assertRaises(TransportNotPossible,
289
                    t.mkdir, 'dir_b')
290
            os.mkdir('dir_b')
291
        else:
292
            t.mkdir('dir_b')
293
        self.assertEqual(t.has('dir_b'), True)
294
        self.assert_(os.path.isdir('dir_b'))
295
296
        if self.readonly:
297
            self.assertRaises(TransportNotPossible,
298
                    t.mkdir_multi, ['dir_c', 'dir_d'])
299
            os.mkdir('dir_c')
300
            os.mkdir('dir_d')
301
        else:
302
            t.mkdir_multi(['dir_c', 'dir_d'])
303
304
        if self.readonly:
305
            self.assertRaises(TransportNotPossible,
306
                    t.mkdir_multi, iter(['dir_e', 'dir_f']))
307
            os.mkdir('dir_e')
308
            os.mkdir('dir_f')
309
        else:
310
            t.mkdir_multi(iter(['dir_e', 'dir_f']))
311
        self.assertEqual(list(t.has_multi(
312
            ['dir_a', 'dir_b', 'dir_c', 'dir_q',
313
             'dir_d', 'dir_e', 'dir_f', 'dir_b'])),
314
            [True, True, True, False,
315
             True, True, True, True])
316
        for d in ['dir_a', 'dir_b', 'dir_c', 'dir_d', 'dir_e', 'dir_f']:
317
            self.assert_(os.path.isdir(d))
318
319
        if not self.readonly:
320
            self.assertRaises(NoSuchFile, t.mkdir, 'path/doesnt/exist')
321
            self.assertRaises(FileExists, t.mkdir, 'dir_a') # Creating a directory again should fail
322
323
        # Make sure the transport recognizes when a
324
        # directory is created by other means
325
        # Caching Transports will fail, because dir_e was already seen not
326
        # to exist. So instead, we will search for a new directory
327
        #os.mkdir('dir_e')
328
        #if not self.readonly:
329
        #    self.assertRaises(FileExists, t.mkdir, 'dir_e')
330
331
        os.mkdir('dir_g')
332
        if not self.readonly:
333
            self.assertRaises(FileExists, t.mkdir, 'dir_g')
334
335
        # Test get/put in sub-directories
336
        if self.readonly:
337
            open('dir_a/a', 'wb').write('contents of dir_a/a')
338
            open('dir_b/b', 'wb').write('contents of dir_b/b')
339
        else:
340
            self.assertEqual(
341
                t.put_multi([('dir_a/a', 'contents of dir_a/a'),
342
                             ('dir_b/b', 'contents of dir_b/b')])
343
                          , 2)
344
        for f in ('dir_a/a', 'dir_b/b'):
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
345
            self.assertEqual(t.get(f).read(), open(f, 'rb').read())
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
346
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
347
        if not self.readonly:
348
            # Test mkdir with a mode
349
            t.mkdir('dmode755', mode=0755)
350
            check_mode(self, 'dmode755', 0755)
351
352
            t.mkdir('dmode555', mode=0555)
353
            check_mode(self, 'dmode555', 0555)
354
355
            t.mkdir('dmode777', mode=0777)
356
            check_mode(self, 'dmode777', 0777)
357
358
            t.mkdir('dmode700', mode=0700)
359
            check_mode(self, 'dmode700', 0700)
360
361
            # TODO: jam 20051215 test mkdir_multi with a mode
362
            t.mkdir_multi(['mdmode755'], mode=0755)
363
            check_mode(self, 'mdmode755', 0755)
364
365
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
366
    def test_copy_to(self):
367
        import tempfile
368
        from bzrlib.transport.local import LocalTransport
369
370
        t = self.get_transport()
371
372
        files = ['a', 'b', 'c', 'd']
373
        self.build_tree(files)
374
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
375
        def get_temp_local():
376
            dtmp = tempfile.mkdtemp(dir=u'.', prefix='test-transport-')
377
            dtmp_base = os.path.basename(dtmp)
378
            return dtmp_base, LocalTransport(dtmp)
379
        dtmp_base, local_t = get_temp_local()
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
380
381
        t.copy_to(files, local_t)
382
        for f in files:
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
383
            self.assertEquals(open(f, 'rb').read(),
384
                    open(pathjoin(dtmp_base, f), 'rb').read())
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
385
1185.16.158 by John Arbash Meinel
Added a test that copy_to raises NoSuchFile when a directory is missing (not IOError)
386
        # Test that copying into a missing directory raises
387
        # NoSuchFile
388
        os.mkdir('e')
389
        open('e/f', 'wb').write('contents of e')
390
        self.assertRaises(NoSuchFile, t.copy_to, ['e/f'], local_t)
391
1185.31.33 by John Arbash Meinel
A couple more path.join statements needed changing.
392
        os.mkdir(pathjoin(dtmp_base, 'e'))
1185.16.158 by John Arbash Meinel
Added a test that copy_to raises NoSuchFile when a directory is missing (not IOError)
393
        t.copy_to(['e/f'], local_t)
394
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
395
        del dtmp_base, local_t
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
396
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
397
        dtmp_base, local_t = get_temp_local()
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
398
399
        files = ['a', 'b', 'c', 'd']
400
        t.copy_to(iter(files), local_t)
401
        for f in files:
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
402
            self.assertEquals(open(f, 'rb').read(),
403
                    open(pathjoin(dtmp_base, f), 'rb').read())
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
404
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
405
        del dtmp_base, local_t
406
407
        for mode in (0666, 0644, 0600, 0400):
408
            dtmp_base, local_t = get_temp_local()
409
            t.copy_to(files, local_t, mode=mode)
410
            for f in files:
411
                check_mode(self, os.path.join(dtmp_base, f), mode)
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
412
413
    def test_append(self):
414
        t = self.get_transport()
415
416
        if self.readonly:
417
            open('a', 'wb').write('diff\ncontents for\na\n')
418
            open('b', 'wb').write('contents\nfor b\n')
419
        else:
420
            t.put_multi([
421
                    ('a', 'diff\ncontents for\na\n'),
422
                    ('b', 'contents\nfor b\n')
423
                    ])
424
425
        if self.readonly:
426
            self.assertRaises(TransportNotPossible,
427
                    t.append, 'a', 'add\nsome\nmore\ncontents\n')
428
            _append('a', 'add\nsome\nmore\ncontents\n')
429
        else:
430
            t.append('a', 'add\nsome\nmore\ncontents\n')
431
432
        self.check_file_contents('a', 
433
            'diff\ncontents for\na\nadd\nsome\nmore\ncontents\n')
434
435
        if self.readonly:
436
            self.assertRaises(TransportNotPossible,
437
                    t.append_multi,
438
                        [('a', 'and\nthen\nsome\nmore\n'),
439
                         ('b', 'some\nmore\nfor\nb\n')])
440
            _append('a', 'and\nthen\nsome\nmore\n')
441
            _append('b', 'some\nmore\nfor\nb\n')
442
        else:
443
            t.append_multi([('a', 'and\nthen\nsome\nmore\n'),
444
                    ('b', 'some\nmore\nfor\nb\n')])
445
        self.check_file_contents('a', 
446
            'diff\ncontents for\na\n'
447
            'add\nsome\nmore\ncontents\n'
448
            'and\nthen\nsome\nmore\n')
449
        self.check_file_contents('b', 
450
                'contents\nfor b\n'
451
                'some\nmore\nfor\nb\n')
452
453
        if self.readonly:
454
            _append('a', 'a little bit more\n')
455
            _append('b', 'from an iterator\n')
456
        else:
457
            t.append_multi(iter([('a', 'a little bit more\n'),
458
                    ('b', 'from an iterator\n')]))
459
        self.check_file_contents('a', 
460
            'diff\ncontents for\na\n'
461
            'add\nsome\nmore\ncontents\n'
462
            'and\nthen\nsome\nmore\n'
463
            'a little bit more\n')
464
        self.check_file_contents('b', 
465
                'contents\nfor b\n'
466
                'some\nmore\nfor\nb\n'
467
                'from an iterator\n')
468
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
469
        if self.readonly:
470
            _append('c', 'some text\nfor a missing file\n')
471
            _append('a', 'some text in a\n')
472
            _append('d', 'missing file r\n')
473
        else:
474
            t.append('c', 'some text\nfor a missing file\n')
475
            t.append_multi([('a', 'some text in a\n'),
476
                            ('d', 'missing file r\n')])
477
        self.check_file_contents('a', 
478
            'diff\ncontents for\na\n'
479
            'add\nsome\nmore\ncontents\n'
480
            'and\nthen\nsome\nmore\n'
481
            'a little bit more\n'
482
            'some text in a\n')
483
        self.check_file_contents('c', 'some text\nfor a missing file\n')
484
        self.check_file_contents('d', 'missing file r\n')
485
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
486
    def test_append_file(self):
487
        t = self.get_transport()
488
489
        contents = [
490
            ('f1', 'this is a string\nand some more stuff\n'),
491
            ('f2', 'here is some text\nand a bit more\n'),
492
            ('f3', 'some text for the\nthird file created\n'),
493
            ('f4', 'this is a string\nand some more stuff\n'),
494
            ('f5', 'here is some text\nand a bit more\n'),
495
            ('f6', 'some text for the\nthird file created\n')
496
        ]
497
        
498
        if self.readonly:
499
            for f, val in contents:
500
                open(f, 'wb').write(val)
501
        else:
502
            t.put_multi(contents)
503
504
        a1 = StringIO('appending to\none\n')
505
        if self.readonly:
506
            _append('f1', a1.read())
507
        else:
508
            t.append('f1', a1)
509
510
        del a1
511
512
        self.check_file_contents('f1', 
513
                'this is a string\nand some more stuff\n'
514
                'appending to\none\n')
515
516
        a2 = StringIO('adding more\ntext to two\n')
517
        a3 = StringIO('some garbage\nto put in three\n')
518
519
        if self.readonly:
520
            _append('f2', a2.read())
521
            _append('f3', a3.read())
522
        else:
523
            t.append_multi([('f2', a2), ('f3', a3)])
524
525
        del a2, a3
526
527
        self.check_file_contents('f2',
528
                'here is some text\nand a bit more\n'
529
                'adding more\ntext to two\n')
530
        self.check_file_contents('f3', 
531
                'some text for the\nthird file created\n'
532
                'some garbage\nto put in three\n')
533
534
        # Test that an actual file object can be used with put
535
        a4 = open('f1', 'rb')
536
        if self.readonly:
537
            _append('f4', a4.read())
538
        else:
539
            t.append('f4', a4)
540
541
        del a4
542
543
        self.check_file_contents('f4', 
544
                'this is a string\nand some more stuff\n'
545
                'this is a string\nand some more stuff\n'
546
                'appending to\none\n')
547
548
        a5 = open('f2', 'rb')
549
        a6 = open('f3', 'rb')
550
        if self.readonly:
551
            _append('f5', a5.read())
552
            _append('f6', a6.read())
553
        else:
554
            t.append_multi([('f5', a5), ('f6', a6)])
555
556
        del a5, a6
557
558
        self.check_file_contents('f5',
559
                'here is some text\nand a bit more\n'
560
                'here is some text\nand a bit more\n'
561
                'adding more\ntext to two\n')
562
        self.check_file_contents('f6',
563
                'some text for the\nthird file created\n'
564
                'some text for the\nthird file created\n'
565
                'some garbage\nto put in three\n')
566
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
567
        a5 = open('f2', 'rb')
568
        a6 = open('f2', 'rb')
569
        a7 = open('f3', 'rb')
570
        if self.readonly:
571
            _append('c', a5.read())
572
            _append('a', a6.read())
573
            _append('d', a7.read())
574
        else:
575
            t.append('c', a5)
576
            t.append_multi([('a', a6), ('d', a7)])
577
        del a5, a6, a7
578
        self.check_file_contents('c', open('f2', 'rb').read())
579
        self.check_file_contents('d', open('f3', 'rb').read())
580
581
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
582
    def test_delete(self):
583
        # TODO: Test Transport.delete
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
584
        t = self.get_transport()
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
585
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
586
        # Not much to do with a readonly transport
587
        if self.readonly:
588
            return
589
590
        open('a', 'wb').write('a little bit of text\n')
591
        self.failUnless(t.has('a'))
592
        self.failUnlessExists('a')
593
        t.delete('a')
594
        self.failIf(os.path.lexists('a'))
595
596
        self.assertRaises(NoSuchFile, t.delete, 'a')
597
598
        open('a', 'wb').write('a text\n')
599
        open('b', 'wb').write('b text\n')
600
        open('c', 'wb').write('c text\n')
601
        self.assertEqual([True, True, True],
602
                list(t.has_multi(['a', 'b', 'c'])))
603
        t.delete_multi(['a', 'c'])
604
        self.assertEqual([False, True, False],
605
                list(t.has_multi(['a', 'b', 'c'])))
606
        self.failIf(os.path.lexists('a'))
607
        self.failUnlessExists('b')
608
        self.failIf(os.path.lexists('c'))
609
610
        self.assertRaises(NoSuchFile,
611
                t.delete_multi, ['a', 'b', 'c'])
612
613
        self.assertRaises(NoSuchFile,
614
                t.delete_multi, iter(['a', 'b', 'c']))
615
616
        open('a', 'wb').write('another a text\n')
617
        open('c', 'wb').write('another c text\n')
618
        t.delete_multi(iter(['a', 'b', 'c']))
619
620
        # We should have deleted everything
621
        # SftpServer creates control files in the
622
        # working directory, so we can just do a
623
        # plain "listdir".
624
        # self.assertEqual([], os.listdir('.'))
625
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
626
    def test_move(self):
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
627
        t = self.get_transport()
628
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
629
        if self.readonly:
630
            return
631
632
        # TODO: I would like to use os.listdir() to
633
        # make sure there are no extra files, but SftpServer
634
        # creates control files in the working directory
635
        # perhaps all of this could be done in a subdirectory
636
637
        open('a', 'wb').write('a first file\n')
638
        self.assertEquals([True, False], list(t.has_multi(['a', 'b'])))
639
640
        t.move('a', 'b')
641
        self.failUnlessExists('b')
642
        self.failIf(os.path.lexists('a'))
643
644
        self.check_file_contents('b', 'a first file\n')
645
        self.assertEquals([False, True], list(t.has_multi(['a', 'b'])))
646
647
        # Overwrite a file
648
        open('c', 'wb').write('c this file\n')
649
        t.move('c', 'b')
650
        self.failIf(os.path.lexists('c'))
651
        self.check_file_contents('b', 'c this file\n')
652
653
        # TODO: Try to write a test for atomicity
654
        # TODO: Test moving into a non-existant subdirectory
655
        # TODO: Test Transport.move_multi
656
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
657
    def test_copy(self):
658
        t = self.get_transport()
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
659
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
660
        if self.readonly:
661
            return
662
663
        open('a', 'wb').write('a file\n')
664
        t.copy('a', 'b')
665
        self.check_file_contents('b', 'a file\n')
666
667
        self.assertRaises(NoSuchFile, t.copy, 'c', 'd')
668
        os.mkdir('c')
669
        # What should the assert be if you try to copy a
670
        # file over a directory?
671
        #self.assertRaises(Something, t.copy, 'a', 'c')
672
        open('d', 'wb').write('text in d\n')
673
        t.copy('d', 'b')
674
        self.check_file_contents('b', 'text in d\n')
675
676
        # TODO: test copy_multi
677
1185.35.31 by Aaron Bentley
Throw ConnectionError instead of NoSuchFile except when we get a 404
678
    def test_connection_error(self):
679
        """ConnectionError is raised when connection is impossible"""
680
        if not hasattr(self, "get_bogus_transport"):
681
            return
682
        t = self.get_bogus_transport()
1185.31.19 by John Arbash Meinel
Updating transport test, to handle NoSuchFile if a bogus url accidentally resolves.
683
        try:
684
            t.get('.bzr/branch')
685
        except (ConnectionError, NoSuchFile), e:
686
            pass
687
        except (Exception), e:
688
            self.failIf(True, 'Wrong exception thrown: %s' % e)
689
        else:
690
            self.failIf(True, 'Did not get the expected exception.')
1442.1.44 by Robert Collins
Many transport related tweaks:
691
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
692
    def test_stat(self):
693
        # TODO: Test stat, just try once, and if it throws, stop testing
694
        from stat import S_ISDIR, S_ISREG
695
696
        t = self.get_transport()
697
698
        try:
699
            st = t.stat('.')
700
        except TransportNotPossible, e:
701
            # This transport cannot stat
702
            return
703
704
        paths = ['a', 'b/', 'b/c', 'b/d/', 'b/d/e']
705
        self.build_tree(paths)
706
707
        local_stats = []
708
709
        for p in paths:
710
            st = t.stat(p)
711
            local_st = os.stat(p)
712
            if p.endswith('/'):
713
                self.failUnless(S_ISDIR(st.st_mode))
714
            else:
715
                self.failUnless(S_ISREG(st.st_mode))
716
            self.assertEqual(local_st.st_size, st.st_size)
717
            self.assertEqual(local_st.st_mode, st.st_mode)
718
            local_stats.append(local_st)
719
720
        remote_stats = list(t.stat_multi(paths))
721
        remote_iter_stats = list(t.stat_multi(iter(paths)))
722
723
        for local, remote, remote_iter in \
724
            zip(local_stats, remote_stats, remote_iter_stats):
725
            self.assertEqual(local.st_mode, remote.st_mode)
726
            self.assertEqual(local.st_mode, remote_iter.st_mode)
727
728
            self.assertEqual(local.st_size, remote.st_size)
729
            self.assertEqual(local.st_size, remote_iter.st_size)
730
            # Should we test UID/GID?
731
732
        self.assertRaises(NoSuchFile, t.stat, 'q')
733
        self.assertRaises(NoSuchFile, t.stat, 'b/a')
734
735
        self.assertListRaises(NoSuchFile, t.stat_multi, ['a', 'c', 'd'])
736
        self.assertListRaises(NoSuchFile, t.stat_multi, iter(['a', 'c', 'd']))
737
738
    def test_list_dir(self):
739
        # TODO: Test list_dir, just try once, and if it throws, stop testing
740
        t = self.get_transport()
741
        
742
        if not t.listable():
743
            self.assertRaises(TransportNotPossible, t.list_dir, '.')
744
            return
745
1185.33.80 by Martin Pool
[merge] john
746
        def sorted_list(d):
747
            l = list(t.list_dir(d))
748
            l.sort()
749
            return l
750
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
751
        # SftpServer creates control files in the working directory
752
        # so lets move down a directory to be safe
753
        os.mkdir('wd')
754
        os.chdir('wd')
755
        t = t.clone('wd')
756
1185.33.80 by Martin Pool
[merge] john
757
        self.assertEqual([], sorted_list(u'.'))
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
758
        self.build_tree(['a', 'b', 'c/', 'c/d', 'c/e'])
759
1185.33.80 by Martin Pool
[merge] john
760
        self.assertEqual([u'a', u'b', u'c'], sorted_list(u'.'))
761
        self.assertEqual([u'd', u'e'], sorted_list(u'c'))
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
762
763
        os.remove('c/d')
764
        os.remove('b')
1185.33.80 by Martin Pool
[merge] john
765
        self.assertEqual([u'a', u'c'], sorted_list('.'))
766
        self.assertEqual([u'e'], sorted_list(u'c'))
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
767
768
        self.assertListRaises(NoSuchFile, t.list_dir, 'q')
769
        self.assertListRaises(NoSuchFile, t.list_dir, 'c/f')
770
        self.assertListRaises(NoSuchFile, t.list_dir, 'a')
771
772
    def test_clone(self):
773
        # TODO: Test that clone moves up and down the filesystem
774
        t1 = self.get_transport()
775
776
        self.build_tree(['a', 'b/', 'b/c'])
777
778
        self.failUnless(t1.has('a'))
779
        self.failUnless(t1.has('b/c'))
780
        self.failIf(t1.has('c'))
781
782
        t2 = t1.clone('b')
783
        self.failUnless(t2.has('c'))
784
        self.failIf(t2.has('a'))
785
786
        t3 = t2.clone('..')
787
        self.failUnless(t3.has('a'))
788
        self.failIf(t3.has('c'))
789
790
        self.failIf(t1.has('b/d'))
791
        self.failIf(t2.has('d'))
792
        self.failIf(t3.has('b/d'))
793
794
        if self.readonly:
795
            open('b/d', 'wb').write('newfile\n')
796
        else:
797
            t2.put('d', 'newfile\n')
798
799
        self.failUnless(t1.has('b/d'))
800
        self.failUnless(t2.has('d'))
801
        self.failUnless(t3.has('b/d'))
802
1185.35.31 by Aaron Bentley
Throw ConnectionError instead of NoSuchFile except when we get a 404
803
        
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
804
class LocalTransportTest(TestCaseInTempDir, TestTransportMixIn):
805
    def get_transport(self):
806
        from bzrlib.transport.local import LocalTransport
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
807
        return LocalTransport(u'.')
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
808
1442.1.44 by Robert Collins
Many transport related tweaks:
809
1540.3.3 by Martin Pool
Review updates of pycurl transport
810
class UrllibHttpTransportTest(TestCaseWithWebserver, TestTransportMixIn):
811
    """Test urllib client against webserver"""
1442.1.44 by Robert Collins
Many transport related tweaks:
812
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
813
    readonly = True
1442.1.44 by Robert Collins
Many transport related tweaks:
814
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
815
    def get_transport(self):
1540.3.3 by Martin Pool
Review updates of pycurl transport
816
        from bzrlib.transport.http._urllib import HttpTransport
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
817
        url = self.get_remote_url(u'.')
1185.11.22 by John Arbash Meinel
Major refactoring of testtransport.
818
        return HttpTransport(url)
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
819
1185.35.31 by Aaron Bentley
Throw ConnectionError instead of NoSuchFile except when we get a 404
820
    def get_bogus_transport(self):
1540.3.3 by Martin Pool
Review updates of pycurl transport
821
        from bzrlib.transport.http._urllib import HttpTransport
1185.33.17 by Martin Pool
[merge] aaron, various fixes
822
        return HttpTransport('http://jasldkjsalkdjalksjdkljasd')
1185.35.31 by Aaron Bentley
Throw ConnectionError instead of NoSuchFile except when we get a 404
823
1442.1.44 by Robert Collins
Many transport related tweaks:
824
1540.3.3 by Martin Pool
Review updates of pycurl transport
825
class PyCurlTransportTest(TestCaseWithWebserver, TestTransportMixIn):
826
    """Test pycurl client against webserver"""
827
828
    readonly = True
829
830
    def get_transport(self):
831
        from bzrlib.transport.http._pycurl import PyCurlTransport
832
        url = self.get_remote_url(u'.')
833
        return PyCurlTransport(url)
834
835
    def get_bogus_transport(self):
836
        from bzrlib.transport.http._pycurl import PyCurlTransport
837
        return PyCurlTransport('http://jasldkjsalkdjalksjdkljasd')
838
839
1442.1.44 by Robert Collins
Many transport related tweaks:
840
class TestMemoryTransport(TestCase):
841
842
    def test_get_transport(self):
843
        memory.MemoryTransport()
844
845
    def test_clone(self):
846
        transport = memory.MemoryTransport()
847
        self.failUnless(transport.clone() is transport)
848
849
    def test_abspath(self):
850
        transport = memory.MemoryTransport()
851
        self.assertEqual("in-memory:relpath", transport.abspath('relpath'))
852
853
    def test_relpath(self):
854
        transport = memory.MemoryTransport()
855
856
    def test_append_and_get(self):
857
        transport = memory.MemoryTransport()
858
        transport.append('path', StringIO('content'))
859
        self.assertEqual(transport.get('path').read(), 'content')
860
        transport.append('path', StringIO('content'))
861
        self.assertEqual(transport.get('path').read(), 'contentcontent')
862
863
    def test_put_and_get(self):
864
        transport = memory.MemoryTransport()
865
        transport.put('path', StringIO('content'))
866
        self.assertEqual(transport.get('path').read(), 'content')
867
        transport.put('path', StringIO('content'))
868
        self.assertEqual(transport.get('path').read(), 'content')
869
870
    def test_append_without_dir_fails(self):
871
        transport = memory.MemoryTransport()
872
        self.assertRaises(NoSuchFile,
873
                          transport.append, 'dir/path', StringIO('content'))
874
875
    def test_put_without_dir_fails(self):
876
        transport = memory.MemoryTransport()
877
        self.assertRaises(NoSuchFile,
878
                          transport.put, 'dir/path', StringIO('content'))
879
880
    def test_get_missing(self):
881
        transport = memory.MemoryTransport()
882
        self.assertRaises(NoSuchFile, transport.get, 'foo')
883
884
    def test_has_missing(self):
885
        transport = memory.MemoryTransport()
886
        self.assertEquals(False, transport.has('foo'))
887
888
    def test_has_present(self):
889
        transport = memory.MemoryTransport()
890
        transport.append('foo', StringIO('content'))
891
        self.assertEquals(True, transport.has('foo'))
892
893
    def test_mkdir(self):
894
        transport = memory.MemoryTransport()
895
        transport.mkdir('dir')
896
        transport.append('dir/path', StringIO('content'))
897
        self.assertEqual(transport.get('dir/path').read(), 'content')
898
899
    def test_mkdir_missing_parent(self):
900
        transport = memory.MemoryTransport()
901
        self.assertRaises(NoSuchFile,
902
                          transport.mkdir, 'dir/dir')
903
904
    def test_mkdir_twice(self):
905
        transport = memory.MemoryTransport()
906
        transport.mkdir('dir')
907
        self.assertRaises(FileExists, transport.mkdir, 'dir')
908
909
    def test_parameters(self):
910
        transport = memory.MemoryTransport()
911
        self.assertEqual(True, transport.listable())
912
        self.assertEqual(False, transport.should_cache())
913
914
    def test_iter_files_recursive(self):
915
        transport = memory.MemoryTransport()
916
        transport.mkdir('dir')
917
        transport.put('dir/foo', StringIO('content'))
918
        transport.put('dir/bar', StringIO('content'))
919
        transport.put('bar', StringIO('content'))
920
        paths = set(transport.iter_files_recursive())
921
        self.assertEqual(set(['dir/foo', 'dir/bar', 'bar']), paths)
922
923
    def test_stat(self):
924
        transport = memory.MemoryTransport()
925
        transport.put('foo', StringIO('content'))
926
        transport.put('bar', StringIO('phowar'))
927
        self.assertEqual(7, transport.stat('foo').st_size)
928
        self.assertEqual(6, transport.stat('bar').st_size)
1185.35.31 by Aaron Bentley
Throw ConnectionError instead of NoSuchFile except when we get a 404
929