Rev 6291: Less script splitting in tests. in file:///home/vila/src/bzr/bugs/884270-merge-po/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/884270-merge-po/

------------------------------------------------------------
revno: 6291
revision-id: v.ladeuil+lp at free.fr-20111129082410-942reo794b2vlhk1
parent: v.ladeuil+lp at free.fr-20111129074655-u10pfmd09kgn7pa0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 884270-merge-po
timestamp: Tue 2011-11-29 09:24:10 +0100
message:
  Less script splitting in tests.
-------------- next part --------------
=== modified file 'bzrlib/plugins/po_merge/tests/test_po_merge.py'
--- a/bzrlib/plugins/po_merge/tests/test_po_merge.py	2011-11-29 07:46:21 +0000
+++ b/bzrlib/plugins/po_merge/tests/test_po_merge.py	2011-11-29 08:24:10 +0000
@@ -76,18 +76,10 @@
         self.run_script("""\
 $ bzr resolve po/adduser.pot
 2>1 conflict resolved, 1 remaining
-""")
-        # set config options to activate the hook
-        self.run_script("""\
-$ bzr config po_merge.po_dirs=po,
-""")
-        # Use remerge to trigger the hook, 
-        self.run_script("""\
+# Use remerge to trigger the hook, we use the default config options here
 $ bzr remerge po/*.po
 2>All changes applied successfully.
-""")
-        # There should be no conflicts anymore
-        self.run_script("""\
+# There should be no conflicts anymore
 $ bzr conflicts
 """)