Rev 5563: One more test for using the additional env. in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5563
revision-id: v.ladeuil+lp at free.fr-20110204171458-dwmwixlsbg1cjoad
parent: v.ladeuil+lp at free.fr-20110204165658-d71gn0hemlaxdcu0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: interpolate
timestamp: Fri 2011-02-04 18:14:58 +0100
message:
  One more test for using the additional env.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-02-04 16:51:38 +0000
+++ b/bzrlib/tests/test_config.py	2011-02-04 17:14:58 +0000
@@ -355,24 +355,30 @@
         c = self.get_config('')
         self.assertInterpolate('foo', c, 'foo')
 
-    def test_in_env(self):
+    def test_env_adding_options(self):
         c = self.get_config('')
         self.assertInterpolate('bar', c, '{foo}', {'foo': 'bar'})
 
+    def test_env_overriding_options(self):
+        c = self.get_config('foo=baz')
+        self.assertInterpolate('bar', c, '{foo}', {'foo': 'bar'})
+
     def test_simple_ref(self):
         c = self.get_config('foo=xxx')
         self.assertInterpolate('xxx', c, '{foo}')
 
     def test_indirect_ref(self):
-        c = self.get_config("""foo=xxx
+        c = self.get_config('''
+foo=xxx
 bar={foo}
-""")
+''')
         self.assertInterpolate('xxx', c, '{bar}')
 
     def test_embedded_ref(self):
-        c = self.get_config("""foo=xxx
+        c = self.get_config('''
+foo=xxx
 bar=foo
-""")
+''')
         self.assertInterpolate('xxx', c, '{{bar}}')
 
     def test_simple_loop(self):
@@ -380,7 +386,10 @@
         self.assertRaises(errors.InterpolationLoop, c.interpolate, '{foo}')
 
     def test_indirect_loop(self):
-        c = self.get_config('foo={bar}\nbar={baz}\nbaz={foo}')
+        c = self.get_config('''
+foo={bar}
+bar={baz}
+baz={foo}''')
         e = self.assertRaises(errors.InterpolationLoop,
                               c.interpolate, '{foo}')
         self.assertEquals('foo->bar->baz', e.refs)