← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tuned_gzip.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tuned_gzip.py
106
106
class TestToGzip(tests.TestCase):
107
107
 
108
108
    def assertToGzip(self, chunks):
109
 
        bytes = ''.join(chunks)
 
109
        raw_bytes = ''.join(chunks)
110
110
        gzfromchunks = tuned_gzip.chunks_to_gzip(chunks)
111
 
        gzfrombytes = tuned_gzip.bytes_to_gzip(bytes)
 
111
        gzfrombytes = tuned_gzip.bytes_to_gzip(raw_bytes)
112
112
        self.assertEqual(gzfrombytes, gzfromchunks)
113
113
        decoded = self.applyDeprecated(
114
114
            symbol_versioning.deprecated_in((2, 3, 0)),
115
115
            tuned_gzip.GzipFile, fileobj=StringIO(gzfromchunks)).read()
116
 
        self.assertEqual(bytes, decoded)
 
116
        lraw, ldecoded = len(raw_bytes), len(decoded)
 
117
        self.assertEqual(lraw, ldecoded,
 
118
                         'Expecting data length %d, got %d' % (lraw, ldecoded))
 
119
        self.assertEqual(raw_bytes, decoded)
117
120
 
118
121
    def test_single_chunk(self):
119
122
        self.assertToGzip(['a modest chunk\nwith some various\nbits\n'])