← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
2200
2200
 
2201
2201
    def test_file_urls_are_normalized(self):
2202
2202
        store = self.get_store('foo.conf')
2203
 
        matcher = config.LocationMatcher(store, 'file:///dir/subdir')
2204
 
        self.assertEquals('/dir/subdir', matcher.location)
 
2203
        if sys.platform == 'win32':
 
2204
            expected_url = 'file:///C:/dir/subdir'
 
2205
            expected_location = 'C:/dir/subdir'
 
2206
        else:
 
2207
            expected_url = 'file:///dir/subdir'
 
2208
            expected_location = '/dir/subdir'
 
2209
        matcher = config.LocationMatcher(store, expected_url)
 
2210
        self.assertEquals(expected_location, matcher.location)
2205
2211
 
2206
2212
 
2207
2213
class TestStackGet(tests.TestCase):