Rev 5360: Cleanup bb.test_aliases 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: 5360
revision-id: v.ladeuil+lp at free.fr-20100721173103-hi5qmjelkza6nm12
parent: v.ladeuil+lp at free.fr-20100721172356-wrgv5iv1kdw2muzm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: further-cleanups
timestamp: Wed 2010-07-21 19:31:03 +0200
message:
  Cleanup bb.test_aliases
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_aliases.py'
--- a/bzrlib/tests/blackbox/test_aliases.py	2010-06-23 08:19:28 +0000
+++ b/bzrlib/tests/blackbox/test_aliases.py	2010-07-21 17:31:03 +0000
@@ -18,10 +18,10 @@
 
 import os
 
+from bzrlib import config
 from bzrlib.branch import Branch
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib.trace import mutter
-from bzrlib.config import (ensure_config_dir_exists, config_filename)
 
 
 class TestAliases(TestCaseWithTransport):
@@ -35,18 +35,12 @@
             return self.run_bzr(args, **kwargs)[1]
 
 
-        if os.path.isfile(config_filename()):
-            # Something is wrong in environment,
-            # we risk overwriting users config
-            self.assert_(config_filename() + "exists, abort")
-
-        ensure_config_dir_exists()
-        CONFIG=("[ALIASES]\n"
-                "c=cat\n"
-                "c1=cat -r 1\n"
-                "c2=cat -r 1 -r2\n")
-
-        open(config_filename(),'wb').write(CONFIG)
+        conf = config.GlobalConfig(_content='''[ALIASES]
+c=cat
+c1=cat -r 1
+c2=cat -r 1 -r2
+''')
+        conf._write_config_file()
 
         str1 = 'foo\n'
         str2 = 'bar\n'