~ttx/swift/release-1.4.2

« back to all changes in this revision

Viewing changes to test/unit/obj/test_replicator.py

  • Committer: Tarmac
  • Author(s): gholt, FUJITA Tomonori, John Dickinson, David Goetz, John Dickinson, Joe Arnold, Scott Simpson, joe at cloudscaling, Thierry Carrez
  • Date: 2011-07-26 09:08:37 UTC
  • mfrom: (305.1.1 milestone-proposed)
  • Revision ID: tarmac-20110726090837-fwlvja8dnk7nkppw
Merge 1.4.2 development from trunk (rev331)

Show diffs side-by-side

added added

removed removed

Lines of Context:
272
272
        def assertFileData(file_path, data):
273
273
            with open(file_path, 'r') as fp:
274
274
                fdata = fp.read()
275
 
                self.assertEquals(fdata, data)
 
275
                self.assertEquals(pickle.loads(fdata), pickle.loads(data))
276
276
 
277
277
        df = DiskFile(self.devices, 'sda', '0', 'a', 'c', 'o', FakeLogger())
278
278
        mkdirs(df.datadir)