Rev 5915: (jameinel) Fix spurious windows-specific test failure (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5915 [merge]
revision-id: pqm at pqm.ubuntu.com-20110525165736-3hifkztwm0f5jawx
parent: pqm at pqm.ubuntu.com-20110525153829-l6j2dhwtdwdkwqhb
parent: v.ladeuil+lp at free.fr-20110525141727-10nd2es89prenakf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-05-25 16:57:36 +0000
message:
  (jameinel) Fix spurious windows-specific test failure (Vincent Ladeuil)
modified:
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-05-18 02:47:33 +0000
+++ b/bzrlib/tests/test_config.py	2011-05-25 14:17:27 +0000
@@ -2200,8 +2200,14 @@
 
     def test_file_urls_are_normalized(self):
         store = self.get_store('foo.conf')
-        matcher = config.LocationMatcher(store, 'file:///dir/subdir')
-        self.assertEquals('/dir/subdir', matcher.location)
+        if sys.platform == 'win32':
+            expected_url = 'file:///C:/dir/subdir'
+            expected_location = 'C:/dir/subdir'
+        else:
+            expected_url = 'file:///dir/subdir'
+            expected_location = '/dir/subdir'
+        matcher = config.LocationMatcher(store, expected_url)
+        self.assertEquals(expected_location, matcher.location)
 
 
 class TestStackGet(tests.TestCase):

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-05-21 17:50:49 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-05-25 14:17:27 +0000
@@ -177,6 +177,10 @@
   restoring the wt_scenarios helper that was accidentally deleted.
   (Vincent Ladeuil, #783472)
 
+* Windows locations are different and should be tested accordingly.
+  (Vincent Ladeuil, #788131)
+
+
 bzr 2.4b2
 #########