/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/test_nonascii.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_nonascii.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Test that various operations work in a non-ASCII environment."""
18
18
 
131
131
        self.assertEqual(expected, present)
132
132
 
133
133
    def test_access_normalized(self):
134
 
        # We should always be able to access files created with
 
134
        # We should always be able to access files created with 
135
135
        # normalized filenames
136
136
        # With FAT32 and certain encodings on win32
137
137
        # a_circle_c and a_dots_c actually map to the same file
160
160
                actual = f.read()
161
161
            finally:
162
162
                f.close()
163
 
            self.assertEqual(shouldbe, actual,
 
163
            self.assertEqual(shouldbe, actual, 
164
164
                             'contents of %r is incorrect: %r != %r'
165
165
                             % (path, shouldbe, actual))
166
166