Rev 3631: (Adrian Wilkins) Use osutils.pathjoin() rather than os.path.join() to in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3631
revision-id: pqm at pqm.ubuntu.com-20080814175522-mho538328p19v77a
parent: pqm at pqm.ubuntu.com-20080814172543-nl22gdcodusa8rt0
parent: john at arbash-meinel.com-20080814165925-tg8kwwp6vagaq7tv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 18:55:22 +0100
message:
  (Adrian Wilkins) Use osutils.pathjoin() rather than os.path.join() to
  	set the base directory for tests
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3613.3.5
    revision-id: john at arbash-meinel.com-20080814165925-tg8kwwp6vagaq7tv
    parent: adrian.wilkins at gmail.com-20080808083626-b5s7pwjxhtpsdgnr
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: base_test_path
    timestamp: Thu 2008-08-14 11:59:25 -0500
    message:
      use the right notation for pathjoin.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3613.3.4
    revision-id: adrian.wilkins at gmail.com-20080808083626-b5s7pwjxhtpsdgnr
    parent: adrian.wilkins at gmail.com-20080807165131-ckgunbopmmg0kown
    committer: Adrian Wilkins <adrian.wilkins at gmail.com>
    branch nick: bzr.base_test_path_win32
    timestamp: Fri 2008-08-08 09:36:26 +0100
    message:
      Use pathjoin instead of joinpath just in case anyone ever uses `..`
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3613.3.3
    revision-id: adrian.wilkins at gmail.com-20080807165131-ckgunbopmmg0kown
    parent: adrian.wilkins at gmail.com-20080807162141-ypgdgc2l26tuz9p3
    committer: Adrian Wilkins <adrian.wilkins at gmail.com>
    branch nick: bzr.base_test_path_win32
    timestamp: Thu 2008-08-07 17:51:31 +0100
    message:
      Correctly use osutils.joinpath instead of trying to use non-existent osutils.join()
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3613.3.2
    revision-id: adrian.wilkins at gmail.com-20080807162141-ypgdgc2l26tuz9p3
    parent: adrian.wilkins at gmail.com-20080807153130-bcr87cssqdsdwjtf
    committer: Adrian Wilkins <adrian.wilkins at gmail.com>
    branch nick: bzr.base_test_path_win32
    timestamp: Thu 2008-08-07 17:21:41 +0100
    message:
      Changed to osutils.join as suggested
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3613.3.1
    revision-id: adrian.wilkins at gmail.com-20080807153130-bcr87cssqdsdwjtf
    parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
    committer: Adrian Wilkins <adrian.wilkins at gmail.com>
    branch nick: bzr.base_test_path_win32
    timestamp: Thu 2008-08-07 16:31:30 +0100
    message:
      Changed the base directory setup to use urlutils.join instead of os.path.join
      
      It's a small thing, but on win32, any tests that examine the absolute path of 
      files will fail because they see a backslash where they were expecting a slash.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-08-13 01:30:46 +0000
+++ b/bzrlib/tests/__init__.py	2008-08-14 17:55:22 +0000
@@ -2064,7 +2064,7 @@
         For TestCaseInTempDir we create a temporary directory based on the test
         name and then create two subdirs - test and home under it.
         """
-        name_prefix = os.path.join(self.TEST_ROOT, self._getTestDirPrefix())
+        name_prefix = osutils.pathjoin(self.TEST_ROOT, self._getTestDirPrefix())
         name = name_prefix
         for i in range(100):
             if os.path.exists(name):