Rev 4086: Fix mis-transcribed encoding test scenarios. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 4086
revision-id: robertc at robertcollins.net-20090309065544-932nqxti8mi92l5r
parent: robertc at robertcollins.net-20090307065817-btjngdy1cvv4nwfo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2009-03-09 17:55:44 +1100
message:
  Fix mis-transcribed encoding test scenarios.
=== modified file 'bzrlib/tests/EncodingAdapter.py'
--- a/bzrlib/tests/EncodingAdapter.py	2009-03-07 06:58:17 +0000
+++ b/bzrlib/tests/EncodingAdapter.py	2009-03-09 06:55:44 +0000
@@ -81,32 +81,48 @@
 
 encoding_scenarios = [
         # Permutation 1 of utf-8
-        ('utf-8,1', {'committer':_erik
-                  , 'message':_yellow_horse
-                  , 'filename':_shrimp_sandwich
-                  , 'directory':_nihonjin}),
+        ('utf-8,1', {
+            'committer': _erik,
+            'message': _yellow_horse,
+            'filename': _shrimp_sandwich,
+            'directory': _nihonjin,
+            'encoding': 'utf-8',
+            }),
         # Permutation 2 of utf-8
-        ('utf-8,2', {'committer':_alexander
-                  , 'message':u'Testing ' + _mu
-                  , 'filename':_shalom
-                  , 'directory':_juju}),
-        ('iso-8859-1', {'committer':_erik
-                  , 'message':u'Testing ' + _mu
-                  , 'filename':_juju_alt
-                  , 'directory':_shrimp_sandwich}),
-        ('iso-8859-2', {'committer':_someone
-                  , 'message':_yellow_horse
-                  , 'filename':_yellow
-                  , 'directory':_something}),
-        ('cp1251', {'committer':_alexander
-                  , 'message':u'Testing ' + _mu
-                  , 'filename':_russian_test
-                  , 'directory':_russian_test + 'dir'}),
+        ('utf-8,2', {
+            'committer': _alexander,
+            'message': u'Testing ' + _mu,
+            'filename': _shalom,
+            'directory': _juju,
+            'encoding': 'utf-8',
+            }),
+        ('iso-8859-1', {
+            'committer': _erik,
+            'message': u'Testing ' + _mu,
+            'filename': _juju_alt,
+            'directory': _shrimp_sandwich,
+            'encoding': 'iso-8859-1',
+            }),
+        ('iso-8859-2', {
+            'committer': _someone,
+            'message': _yellow_horse,
+            'filename': _yellow,
+            'directory': _something,
+            'encoding': 'iso-8859-2',
+            }),
+        ('cp1251', {
+            'committer': _alexander,
+            'message': u'Testing ' + _mu,
+            'filename': _russian_test,
+            'directory': _russian_test + 'dir',
+            'encoding': 'cp1251',
+            }),
 # The iso-8859-1 tests run on a default windows cp437 installation
 # and it takes a long time to run an extra permutation of the tests
 # But just in case we want to add this back in:
 #        ('cp437', {'committer':_erik
 #                  , 'message':u'Testing ' + _mu
 #                  , 'filename':'file_' + _omega
-#                  , 'directory':_epsilon + '_dir'}),
+#                  , 'directory':_epsilon + '_dir',
+#            'encoding': 'cp437'}),
     ]