/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/EncodingAdapter.py

  • Committer: Robert Collins
  • Date: 2009-03-09 08:02:47 UTC
  • mto: This revision was merged to the branch mainline in revision 4098.
  • Revision ID: robertc@robertcollins.net-20090309080247-vb9v7oync3vp69tp
Fix mis-transcribed encoding test scenarios.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/EncodingAdapter.py
81
81
 
82
82
encoding_scenarios = [
83
83
        # Permutation 1 of utf-8
84
 
        ('utf-8,1', {'committer':_erik
85
 
                  , 'message':_yellow_horse
86
 
                  , 'filename':_shrimp_sandwich
87
 
                  , 'directory':_nihonjin}),
 
84
        ('utf-8,1', {
 
85
            'info': {
 
86
                'committer': _erik,
 
87
                'message': _yellow_horse,
 
88
                'filename': _shrimp_sandwich,
 
89
                'directory': _nihonjin,
 
90
                },
 
91
            'encoding': 'utf-8',
 
92
            }),
88
93
        # Permutation 2 of utf-8
89
 
        ('utf-8,2', {'committer':_alexander
90
 
                  , 'message':u'Testing ' + _mu
91
 
                  , 'filename':_shalom
92
 
                  , 'directory':_juju}),
93
 
        ('iso-8859-1', {'committer':_erik
94
 
                  , 'message':u'Testing ' + _mu
95
 
                  , 'filename':_juju_alt
96
 
                  , 'directory':_shrimp_sandwich}),
97
 
        ('iso-8859-2', {'committer':_someone
98
 
                  , 'message':_yellow_horse
99
 
                  , 'filename':_yellow
100
 
                  , 'directory':_something}),
101
 
        ('cp1251', {'committer':_alexander
102
 
                  , 'message':u'Testing ' + _mu
103
 
                  , 'filename':_russian_test
104
 
                  , 'directory':_russian_test + 'dir'}),
 
94
        ('utf-8,2', {
 
95
            'info': {
 
96
                'committer': _alexander,
 
97
                'message': u'Testing ' + _mu,
 
98
                'filename': _shalom,
 
99
                'directory': _juju,
 
100
                },
 
101
            'encoding': 'utf-8',
 
102
            }),
 
103
        ('iso-8859-1', {
 
104
            'info': {
 
105
                'committer': _erik,
 
106
                'message': u'Testing ' + _mu,
 
107
                'filename': _juju_alt,
 
108
                'directory': _shrimp_sandwich,
 
109
                },
 
110
            'encoding': 'iso-8859-1',
 
111
            }),
 
112
        ('iso-8859-2', {
 
113
            'info': {
 
114
                'committer': _someone,
 
115
                'message': _yellow_horse,
 
116
                'filename': _yellow,
 
117
                'directory': _something,
 
118
                },
 
119
            'encoding': 'iso-8859-2',
 
120
            }),
 
121
        ('cp1251', {
 
122
            'info': {
 
123
                'committer': _alexander,
 
124
                'message': u'Testing ' + _mu,
 
125
                'filename': _russian_test,
 
126
                'directory': _russian_test + 'dir',
 
127
                },
 
128
            'encoding': 'cp1251',
 
129
            }),
105
130
# The iso-8859-1 tests run on a default windows cp437 installation
106
131
# and it takes a long time to run an extra permutation of the tests
107
132
# But just in case we want to add this back in:
108
133
#        ('cp437', {'committer':_erik
109
134
#                  , 'message':u'Testing ' + _mu
110
135
#                  , 'filename':'file_' + _omega
111
 
#                  , 'directory':_epsilon + '_dir'}),
 
136
#                  , 'directory':_epsilon + '_dir',
 
137
#            'encoding': 'cp437'}),
112
138
    ]