← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_serve.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
274
274
 
275
275
class TestUserdirExpansion(TestCaseWithMemoryTransport):
276
276
 
277
 
    def fake_expanduser(self, path):
 
277
    @staticmethod
 
278
    def fake_expanduser(path):
278
279
        """A simple, environment-independent, function for the duration of this
279
280
        test.
280
281