← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_atomicfile.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 17:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160121174807-g4ybpaij9ln5wj6a
https://launchpad.net/bugs/106898
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.

There was a mix of AssertionError or UnicodeEncodeError.

Also deleted test_put_file_unicode() which was bogus, files contain bytes not unicode strings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_atomicfile.py
124
124
        f.commit()
125
125
        st = os.lstat('test')
126
126
        self.assertEqualMode(0666 & ~umask, stat.S_IMODE(st.st_mode))
127
 
 
128
 
    def test_closed(self):
129
 
        local_warnings = []
130
 
        def capture_warnings(msg, cls, stacklevel=None):
131
 
            self.assertEqual(cls, DeprecationWarning)
132
 
            local_warnings.append(msg)
133
 
 
134
 
        method = symbol_versioning.warn
135
 
        try:
136
 
            symbol_versioning.set_warning_method(capture_warnings)
137
 
            f = atomicfile.AtomicFile('test', mode='wb')
138
 
            self.assertEqual(False, f.closed)
139
 
            f.abort()
140
 
            self.assertEqual(True, f.closed)
141
 
 
142
 
            f = atomicfile.AtomicFile('test', mode='wb')
143
 
            f.close()
144
 
            self.assertEqual(True, f.closed)
145
 
 
146
 
            f = atomicfile.AtomicFile('test', mode='wb')
147
 
            f.commit()
148
 
            self.assertEqual(True, f.closed)
149
 
        finally:
150
 
            symbol_versioning.set_warning_method(method)
151
 
 
152
 
        txt = 'AtomicFile.closed deprecated in bzr 0.10'
153
 
        self.assertEqual([txt]*4, local_warnings)