Rev 5359: Cleanup bb.test_help. 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: 5359
revision-id: v.ladeuil+lp at free.fr-20100721172356-wrgv5iv1kdw2muzm
parent: v.ladeuil+lp at free.fr-20100721171927-nm2hmex14j5rodkz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: further-cleanups
timestamp: Wed 2010-07-21 19:23:56 +0200
message:
  Cleanup bb.test_help.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_help.py'
--- a/bzrlib/tests/blackbox/test_help.py	2010-06-11 07:32:12 +0000
+++ b/bzrlib/tests/blackbox/test_help.py	2010-07-21 17:23:56 +0000
@@ -20,8 +20,8 @@
 
 
 import bzrlib
+from bzrlib import config
 from bzrlib.tests import TestCaseWithTransport
-from bzrlib.config import (ensure_config_dir_exists, config_filename)
 
 
 class TestHelp(TestCaseWithTransport):
@@ -161,12 +161,12 @@
     def test_help_with_aliases(self):
         original = self.run_bzr('help cat')[0]
 
-        ensure_config_dir_exists()
-        CONFIG=("[ALIASES]\n"
-        "c=cat\n"
-        "cat=cat\n")
-
-        open(config_filename(),'wb').write(CONFIG)
+        content = '''[ALIASES]
+c=cat
+cat=cat
+'''
+        conf = config.GlobalConfig(_content=content)
+        conf._write_config_file()
 
         expected = original + "'bzr cat' is an alias for 'bzr cat'.\n"
         self.assertEqual(expected, self.run_bzr('help cat')[0])