← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

[merge] win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
21
21
from bzrlib.tests import TestCaseInTempDir, TestCase
22
22
from bzrlib.tests.test_transport import TestTransportMixIn
23
23
import bzrlib.errors as errors
 
24
from bzrlib.osutils import pathjoin, lexists
24
25
 
25
26
try:
26
27
    import paramiko
90
91
    
91
92
    def _run_server(self, s, stop_event):
92
93
        ssh_server = paramiko.Transport(s)
93
 
        key_file = os.path.join(self._root, 'test_rsa.key')
 
94
        key_file = pathjoin(self._root, 'test_rsa.key')
94
95
        file(key_file, 'w').write(STUB_SERVER_KEY)
95
96
        host_key = paramiko.RSAKey.from_private_key_file(key_file)
96
97
        ssh_server.add_server_key(host_key)
157
158
        self.assertRaises(LockError, t.lock_write, 'bogus')
158
159
 
159
160
        l.unlock()
160
 
        self.failIf(os.path.lexists('bogus.write-lock'))
 
161
        self.failIf(lexists('bogus.write-lock'))
161
162
 
162
163
        open('something.write-lock', 'wb').write('fake lock\n')
163
164
        self.assertRaises(LockError, t.lock_write, 'something')
270
271
        self.failUnlessExists('.bzr/branch-format')
271
272
        self.failUnlessExists('.bzr/branch-lock')
272
273
 
273
 
        self.failIf(os.path.lexists('.bzr/branch-lock.write-lock'))
 
274
        self.failIf(lexists('.bzr/branch-lock.write-lock'))
274
275
        b.lock_write()
275
276
        self.failUnlessExists('.bzr/branch-lock.write-lock')
276
277
        b.unlock()
277
 
        self.failIf(os.path.lexists('.bzr/branch-lock.write-lock'))
 
278
        self.failIf(lexists('.bzr/branch-lock.write-lock'))
278
279
 
279
280
    def test_no_working_tree(self):
280
281
        from bzrlib.branch import Branch
298
299
 
299
300
        self.assertEquals(b2.revision_history(), ['a1'])
300
301
 
 
302
        open('a/foo', 'wt').write('something new in foo\n')
 
303
        t.commit('new', rev_id='a2')
 
304
        b2.pull(b)
 
305
 
 
306
        self.assertEquals(b2.revision_history(), ['a1', 'a2'])
 
307
 
301
308
 
302
309
if not paramiko_loaded:
303
310
    # TODO: Skip these