← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Robert Collins
  • Date: 2008-01-03 21:02:06 UTC
  • mfrom: (3162 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3163.
  • Revision ID: robertc@robertcollins.net-20080103210206-eqvta89m37jgjjfi
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
656
656
        self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
657
657
 
658
658
    def test_get_readonly_url_http(self):
659
 
        from bzrlib.tests.HttpServer import HttpServer
 
659
        from bzrlib.tests.http_server import HttpServer
660
660
        from bzrlib.transport import get_transport
661
661
        from bzrlib.transport.local import LocalURLServer
662
662
        from bzrlib.transport.http import HttpTransportBase
1805
1805
        # code.
1806
1806
        out, err = self.run_bzr(["log", "/nonexistantpath"], retcode=3)
1807
1807
        self.assertEqual(out, '')
1808
 
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "/nonexistantpath/".\n')
 
1808
        self.assertContainsRe(err,
 
1809
            'bzr: ERROR: Not a branch: ".*nonexistantpath/".\n')
1809
1810
 
1810
1811
 
1811
1812
class TestTestLoader(TestCase):