Rev 5363: Cleanup bb.test_alias. 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: 5363
revision-id: v.ladeuil+lp at free.fr-20100722071245-l5j4ynehjagk6ii4
parent: v.ladeuil+lp at free.fr-20100722065302-e9x2ij9o4ribaxzn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: further-cleanups
timestamp: Thu 2010-07-22 09:12:45 +0200
message:
  Cleanup bb.test_alias.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_alias.py'
--- a/bzrlib/tests/blackbox/test_alias.py	2010-06-23 08:19:28 +0000
+++ b/bzrlib/tests/blackbox/test_alias.py	2010-07-22 07:12:45 +0000
@@ -16,14 +16,14 @@
 #
 
 """Tests of the 'bzr alias' command."""
-import os
-import codecs
-
-from bzrlib.tests import TestCaseWithTransport
-from bzrlib.config import (ensure_config_dir_exists, config_filename)
-
-
-class TestAlias(TestCaseWithTransport):
+
+from bzrlib import (
+    config,
+    tests,
+    )
+
+
+class TestAlias(tests.TestCaseWithTransport):
 
     def test_list_alias_with_none(self):
         """Calling alias with no parameters lists existing aliases."""
@@ -46,7 +46,6 @@
 
     def test_unicode_alias(self):
         """Unicode aliases should work (Bug #529930)"""
-        config_enc = 'utf-8'
         file_name = u'foo\xb6'
 
         tree = self.make_branch_and_tree('.')
@@ -54,11 +53,8 @@
         tree.add(file_name)
         tree.commit('added')
 
-        ensure_config_dir_exists()
-        CONFIG=(u'[ALIASES]\n'
-                u'ust=st foo\xb6\n')
-
-        codecs.open(config_filename(),'w', config_enc).write(CONFIG)
+        config.GlobalConfig(_save=True,
+                            _content=u'[ALIASES]\nust=st %s\n' % (file_name,))
 
         out, err = self.run_bzr('ust')
         self.assertEquals(err, '')

=== modified file 'bzrlib/tests/blackbox/test_aliases.py'
--- a/bzrlib/tests/blackbox/test_aliases.py	2010-07-22 06:53:02 +0000
+++ b/bzrlib/tests/blackbox/test_aliases.py	2010-07-22 07:12:45 +0000
@@ -35,7 +35,7 @@
             return self.run_bzr(args, **kwargs)[1]
 
 
-        conf = config.GlobalConfig(_save=True,_content='''[ALIASES]
+        conf = config.GlobalConfig(_save=True, _content='''[ALIASES]
 c=cat
 c1=cat -r 1
 c2=cat -r 1 -r2