Rev 6409: Cleanup a bit and make sure we use at least one file:// url in the tests. in file:///home/vila/src/bzr/bugs/832046-globs-store-ordered/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/832046-globs-store-ordered/

------------------------------------------------------------
revno: 6409
revision-id: v.ladeuil+lp at free.fr-20120103101900-b4xcrced6mitukhj
parent: v.ladeuil+lp at free.fr-20111222174549-8r3s2uulcj7pav2g
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 832046-globs-store-ordered
timestamp: Tue 2012-01-03 11:19:00 +0100
message:
  Cleanup a bit and make sure we use at least one file:// url in the tests.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-12-22 17:45:49 +0000
+++ b/bzrlib/config.py	2012-01-03 10:19:00 +0000
@@ -3379,8 +3379,8 @@
             section_path = section.id
             if section_path.startswith('file://'):
                 # the location is already a local path or URL, convert the
-                # section to the same format
-                section_path = urlutils.local_path_from_url(section)
+                # section id to the same format
+                section_path = urlutils.local_path_from_url(section_path)
             if (self.location.startswith(section_path)
                 or fnmatch.fnmatch(self.location, section_path)):
                 section_parts = section_path.rstrip('/').split('/')

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-12-22 17:45:49 +0000
+++ b/bzrlib/tests/test_config.py	2012-01-03 10:19:00 +0000
@@ -3307,7 +3307,6 @@
 
     def setUp(self):
         super(TestStartingPathMatcher, self).setUp()
-        self.matcher = config.NameMatcher
         # Any simple store is good enough
         self.store = config.IniFileStore()
 
@@ -3320,7 +3319,7 @@
         return sections
 
     def test_empty(self):
-        self.assertSectionIDs([], self.test_dir, '')
+        self.assertSectionIDs([], self.get_url(), '')
 
     def test_no_name_section_included_when_present(self):
         # Note that other tests will cover the case where the no-name section