Rev 5364: Cleanup bt.per_branch.test_branch. in file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

------------------------------------------------------------
revno: 5364
revision-id: v.ladeuil+lp at free.fr-20100722072038-m4xr03ddn086ymj1
parent: v.ladeuil+lp at free.fr-20100722071245-l5j4ynehjagk6ii4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: further-cleanups
timestamp: Thu 2010-07-22 09:20:38 +0200
message:
  Cleanup bt.per_branch.test_branch.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py	2010-04-29 08:59:13 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py	2010-07-22 07:20:38 +0000
@@ -19,6 +19,7 @@
 from bzrlib import (
     branch as _mod_branch,
     bzrdir,
+    config,
     delta as _mod_delta,
     errors,
     gpg,
@@ -617,13 +618,9 @@
         self.assertEqual(None, self.get_branch().get_push_location())
 
     def test_get_push_location_exact(self):
-        from bzrlib.config import (locations_config_filename,
-                                   ensure_config_dir_exists)
-        ensure_config_dir_exists()
-        fn = locations_config_filename()
-        open(fn, 'wt').write(("[%s]\n"
-                                  "push_location=foo\n" %
-                                  self.get_branch().base[:-1]))
+        b = self.get_branch()
+        config.LocationConfig(b.base, _save=True,
+                              _content='[%s]\npush_location=foo\n' % (b.base,))
         self.assertEqual("foo", self.get_branch().get_push_location())
 
     def test_set_push_location(self):