610
610
test = TestDanglingLock('test_function')
611
611
result = test.run()
612
total_failures = result.errors + result.failures
613
612
if self._lock_check_thorough:
614
self.assertLength(1, total_failures)
613
self.assertEqual(1, len(result.errors))
616
615
# When _lock_check_thorough is disabled, then we don't trigger a
618
self.assertLength(0, total_failures)
617
self.assertEqual(0, len(result.errors))
621
620
class TestTestCaseWithTransport(tests.TestCaseWithTransport):
622
621
"""Tests for the convenience functions TestCaseWithTransport introduces."""
624
623
def test_get_readonly_url_none(self):
624
from bzrlib.transport import get_transport
625
from bzrlib.transport.memory import MemoryServer
625
626
from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
self.vfs_transport_factory = memory.MemoryServer
627
self.vfs_transport_factory = MemoryServer
627
628
self.transport_readonly_server = None
628
629
# calling get_readonly_transport() constructs a decorator on the url
630
631
url = self.get_readonly_url()
631
632
url2 = self.get_readonly_url('foo/bar')
632
t = transport.get_transport(url)
633
t2 = transport.get_transport(url2)
633
t = get_transport(url)
634
t2 = get_transport(url2)
634
635
self.failUnless(isinstance(t, ReadonlyTransportDecorator))
635
636
self.failUnless(isinstance(t2, ReadonlyTransportDecorator))
636
637
self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
638
639
def test_get_readonly_url_http(self):
639
640
from bzrlib.tests.http_server import HttpServer
641
from bzrlib.transport import get_transport
642
from bzrlib.transport.local import LocalURLServer
640
643
from bzrlib.transport.http import HttpTransportBase
641
self.transport_server = test_server.LocalURLServer
644
self.transport_server = LocalURLServer
642
645
self.transport_readonly_server = HttpServer
643
646
# calling get_readonly_transport() gives us a HTTP server instance.
644
647
url = self.get_readonly_url()
645
648
url2 = self.get_readonly_url('foo/bar')
646
649
# the transport returned may be any HttpTransportBase subclass
647
t = transport.get_transport(url)
648
t2 = transport.get_transport(url2)
650
t = get_transport(url)
651
t2 = get_transport(url2)
649
652
self.failUnless(isinstance(t, HttpTransportBase))
650
653
self.failUnless(isinstance(t2, HttpTransportBase))
651
654
self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
677
680
super(TestTestCaseTransports, self).setUp()
678
self.vfs_transport_factory = memory.MemoryServer
681
self.vfs_transport_factory = MemoryServer
680
683
def test_make_bzrdir_preserves_transport(self):
681
684
t = self.get_transport()
682
685
result_bzrdir = self.make_bzrdir('subdir')
683
686
self.assertIsInstance(result_bzrdir.transport,
684
memory.MemoryTransport)
685
688
# should not be on disk, should only be in memory
686
689
self.failIfExists('subdir')
689
692
class TestChrootedTest(tests.ChrootedTestCase):
691
694
def test_root_is_root(self):
692
t = transport.get_transport(self.get_readonly_url())
695
from bzrlib.transport import get_transport
696
t = get_transport(self.get_readonly_url())
694
698
self.assertEqual(url, t.clone('..').base)
878
882
output = result_stream.getvalue()[prefix:]
879
883
lines = output.splitlines()
880
884
self.assertContainsRe(lines[0], r'XFAIL *\d+ms$')
881
if sys.version_info > (2, 7):
882
self.expectFailure("_ExpectedFailure on 2.7 loses the message",
883
self.assertNotEqual, lines[1], ' ')
884
885
self.assertEqual(lines[1], ' foo')
885
886
self.assertEqual(2, len(lines))
1559
1560
def test_start_server_registers_url(self):
1560
transport_server = memory.MemoryServer()
1561
transport_server = MemoryServer()
1561
1562
# A little strict, but unlikely to be changed soon.
1562
1563
self.assertEqual([], self._bzr_selftest_roots)
1563
1564
self.start_server(transport_server)
1804
1805
# make_branch_and_tree has to use local branch and repositories
1805
1806
# when the vfs transport and local disk are colocated, even if
1806
1807
# a different transport is in use for url generation.
1807
self.transport_server = test_server.FakeVFATServer
1808
from bzrlib.transport.fakevfat import FakeVFATServer
1809
self.transport_server = FakeVFATServer
1808
1810
self.assertFalse(self.get_url('t1').startswith('file://'))
1809
1811
tree = self.make_branch_and_tree('t1')
1810
1812
base = tree.bzrdir.root_transport.base
1948
1950
def test_transport_sftp(self):
1949
1951
self.requireFeature(features.paramiko)
1950
from bzrlib.tests import stub_sftp
1951
1952
self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
1953
1954
def test_transport_memory(self):
1954
self.check_transport_set(memory.MemoryServer)
1955
self.check_transport_set(bzrlib.transport.memory.MemoryServer)
1957
1958
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
2340
2341
os.chdir = orig_chdir
2341
2342
self.assertEqual(['foo', 'current'], chdirs)
2343
def test_get_bzr_path_with_cwd_bzrlib(self):
2344
self.get_source_path = lambda: ""
2345
self.overrideAttr(os.path, "isfile", lambda path: True)
2346
self.assertEqual(self.get_bzr_path(), "bzr")
2349
2345
class TestActuallyStartBzrSubprocess(tests.TestCaseWithTransport):
2350
2346
"""Tests that really need to do things with an external bzr."""
2627
2623
# Running bzr in blackbox mode, normal/expected/user errors should be
2628
2624
# caught in the regular way and turned into an error message plus exit
2630
transport_server = memory.MemoryServer()
2626
transport_server = MemoryServer()
2631
2627
transport_server.start_server()
2632
2628
self.addCleanup(transport_server.stop_server)
2633
2629
url = transport_server.get_url()
2815
2805
('bzrlib.tests.per_transport.TransportTests'
2816
2806
'.test_abspath(LocalTransport,LocalURLServer)'),
2817
2807
'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
2808
# modules_to_doctest
2809
'bzrlib.timestamp.format_highres_date',
2818
2810
# plugins can't be tested that way since selftest may be run with
2821
if __doc__ is not None:
2822
expected_test_list.extend([
2823
# modules_to_doctest
2824
'bzrlib.timestamp.format_highres_date',
2826
2813
suite = tests.test_suite()
2827
2814
self.assertEqual(set(["testmod_names", "modules_to_doctest"]),