/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-08 21:22:06 UTC
  • mfrom: (3417 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3418.
  • Revision ID: v.ladeuil+lp@free.fr-20080508212206-kwlteu651izgs5we
merge bzr.dev to fix conflicts in NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
496
496
        """
497
497
        # XXX: TODO: make the server back onto vfs_server rather than local
498
498
        # disk.
499
 
        assert backing_transport_server is None or \
500
 
            isinstance(backing_transport_server, local.LocalURLServer), \
501
 
            "HTTPServer currently assumes local transport, got %s" % \
502
 
            backing_transport_server
 
499
        if not (backing_transport_server is None or \
 
500
                isinstance(backing_transport_server, local.LocalURLServer)):
 
501
            raise AssertionError(
 
502
                "HTTPServer currently assumes local transport, got %s" % \
 
503
                backing_transport_server)
503
504
        self._home_dir = os.getcwdu()
504
505
        self._local_path_parts = self._home_dir.split(os.path.sep)
505
506
        self._http_base_url = None