← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
 
18
18
from cStringIO import StringIO
19
 
import os
20
19
import subprocess
21
20
import sys
22
21
import threading
31
30
from bzrlib.transport import (
32
31
    chroot,
33
32
    fakenfs,
 
33
    http,
34
34
    local,
35
35
    memory,
36
36
    pathfilter,
563
563
        server = HttpServer()
564
564
        self.start_server(server)
565
565
        t = transport.get_transport('readonly+' + server.get_url())
566
 
        self.failUnless(isinstance(t, readonly.ReadonlyTransportDecorator))
 
566
        self.assertIsInstance(t, readonly.ReadonlyTransportDecorator)
567
567
        self.assertEqual(False, t.listable())
568
568
        self.assertEqual(True, t.is_readonly())
569
569
 
746
746
        self.assertEquals(t._host, 'simple.example.com')
747
747
        self.assertEquals(t._port, None)
748
748
        self.assertEquals(t._path, '/home/source/')
749
 
        self.failUnless(t._user is None)
750
 
        self.failUnless(t._password is None)
 
749
        self.assertTrue(t._user is None)
 
750
        self.assertTrue(t._password is None)
751
751
 
752
752
        self.assertEquals(t.base, 'http://simple.example.com/home/source/')
753
753
 
900
900
 
901
901
        bzr+ssh:// should cause bzr to run a remote bzr smart server over SSH.
902
902
        """
903
 
        raise tests.TestSkipped('this test was recently broken,'
904
 
                                ' see bug #626876')
905
903
        # This test actually causes a bzr instance to be invoked, which is very
906
904
        # expensive: it should be the only such test in the test suite.
907
905
        # A reasonable evolution for this would be to simply check inside
968
966
            bzr_remote_path = sys.executable + ' ' + self.get_bzr_path()
969
967
        else:
970
968
            bzr_remote_path = self.get_bzr_path()
971
 
        os.environ['BZR_REMOTE_PATH'] = bzr_remote_path
 
969
        self.overrideEnv('BZR_REMOTE_PATH', bzr_remote_path)
972
970
 
973
971
        # Access the branch via a bzr+ssh URL.  The BZR_REMOTE_PATH environment
974
972
        # variable is used to tell bzr what command to run on the remote end.
995
993
        # And the rest are threads
996
994
        for t in started[1:]:
997
995
            t.join()
 
996
 
 
997
 
 
998
class TestUnhtml(tests.TestCase):
 
999
 
 
1000
    """Tests for unhtml_roughly"""
 
1001
 
 
1002
    def test_truncation(self):
 
1003
        fake_html = "<p>something!\n" * 1000
 
1004
        result = http.unhtml_roughly(fake_html)
 
1005
        self.assertEquals(len(result), 1000)
 
1006
        self.assertStartsWith(result, " something!")