← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-12 20:18:55 UTC
  • mfrom: (3616.2.12 bzr.work.tests.blackbox)
  • Revision ID: pqm@pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
(Mark Hammond) Win32 test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
30
30
    errors,
31
31
    help_topics,
32
32
    repository,
 
33
    osutils,
33
34
    symbol_versioning,
34
35
    urlutils,
35
36
    win32utils,
532
533
        self.assertEqual(os.path.realpath('topdir'),
533
534
                         self.local_branch_path(branch))
534
535
        self.assertEqual(
535
 
            os.path.realpath(os.path.join('topdir', '.bzr', 'repository')),
 
536
            osutils.realpath(os.path.join('topdir', '.bzr', 'repository')),
536
537
            repo.bzrdir.transport.local_abspath('repository'))
537
538
        self.assertEqual(relpath, 'foo')
538
539
 
545
546
        self.assertEqual(os.path.realpath('branch'),
546
547
                         self.local_branch_path(branch))
547
548
        self.assertEqual(
548
 
            os.path.realpath(os.path.join('branch', '.bzr', 'repository')),
 
549
            osutils.realpath(os.path.join('branch', '.bzr', 'repository')),
549
550
            repo.bzrdir.transport.local_abspath('repository'))
550
551
        self.assertEqual(relpath, 'foo')
551
552
 
557
558
        self.assertEqual(tree, None)
558
559
        self.assertEqual(branch, None)
559
560
        self.assertEqual(
560
 
            os.path.realpath(os.path.join('repo', '.bzr', 'repository')),
 
561
            osutils.realpath(os.path.join('repo', '.bzr', 'repository')),
561
562
            repo.bzrdir.transport.local_abspath('repository'))
562
563
        self.assertEqual(relpath, '')
563
564
 
572
573
        self.assertEqual(os.path.realpath('shared/branch'),
573
574
                         self.local_branch_path(branch))
574
575
        self.assertEqual(
575
 
            os.path.realpath(os.path.join('shared', '.bzr', 'repository')),
 
576
            osutils.realpath(os.path.join('shared', '.bzr', 'repository')),
576
577
            repo.bzrdir.transport.local_abspath('repository'))
577
578
        self.assertEqual(relpath, '')
578
579
 
587
588
        self.assertEqual(os.path.realpath('foo'),
588
589
                         self.local_branch_path(branch))
589
590
        self.assertEqual(
590
 
            os.path.realpath(os.path.join('foo', '.bzr', 'repository')),
 
591
            osutils.realpath(os.path.join('foo', '.bzr', 'repository')),
591
592
            repo.bzrdir.transport.local_abspath('repository'))
592
593
        self.assertEqual(relpath, 'bar')
593
594
 
600
601
        self.assertEqual(tree, None)
601
602
        self.assertEqual(branch, None)
602
603
        self.assertEqual(
603
 
            os.path.realpath(os.path.join('bar', '.bzr', 'repository')),
 
604
            osutils.realpath(os.path.join('bar', '.bzr', 'repository')),
604
605
            repo.bzrdir.transport.local_abspath('repository'))
605
606
        self.assertEqual(relpath, 'baz')
606
607