~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Andrew Bennetts
  • Date: 2008-01-15 06:11:02 UTC
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080115061102-cux3c8xt87uenfin
Tweak for consistency suggested by John's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
197
197
        backing = self.get_transport()
198
198
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
199
199
        self.assertEqual(SmartServerResponse(('ok', )),
200
 
            request.execute('.'))
 
200
            request.execute(''))
201
201
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
202
202
        # no branch, tree or repository is expected with the current 
203
203
        # default formart.
229
229
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
230
230
        self.make_bzrdir('.')
231
231
        self.assertEqual(SmartServerResponse(('nobranch', )),
232
 
            request.execute('/'))
 
232
            request.execute(''))
233
233
 
234
234
    def test_branch(self):
235
235
        """When there is a branch, 'ok' is returned."""
237
237
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
238
238
        self.make_branch('.')
239
239
        self.assertEqual(SmartServerResponse(('ok', '')),
240
 
            request.execute('/'))
 
240
            request.execute(''))
241
241
 
242
242
    def test_branch_reference(self):
243
243
        """When there is a branch reference, the reference URL is returned."""
248
248
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
249
249
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
250
250
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
251
 
            request.execute('/reference'))
 
251
            request.execute('reference'))
252
252
 
253
253
 
254
254
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):