~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_export.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
384
384
        tree.commit('setup', timestamp=315532800)
385
385
        self.run_bzr('export --per-file-timestamps t branch')
386
386
        har_st = os.stat('t/har')
387
 
        self.assertEquals(315532800, har_st.st_mtime)
 
387
        self.assertEqual(315532800, har_st.st_mtime)
388
388
 
389
389
    def test_dir_export_partial_tree_per_file_timestamps(self):
390
390
        tree = self.example_branch()
394
394
        tree.commit('setup', timestamp=315532800)
395
395
        self.run_bzr('export --per-file-timestamps tpart branch/subdir')
396
396
        foo_st = os.stat('tpart/foo.txt')
397
 
        self.assertEquals(315532800, foo_st.st_mtime)
 
397
        self.assertEqual(315532800, foo_st.st_mtime)
398
398
 
399
399
    def test_export_directory(self):
400
400
        """Test --directory option"""
430
430
        self.run_bzr('export --per-file-timestamps test.zip branch')
431
431
        zfile = zipfile.ZipFile('test.zip')
432
432
        info = zfile.getinfo("test/har")
433
 
        self.assertEquals(time.localtime(timestamp)[:6], info.date_time)
 
433
        self.assertEqual(time.localtime(timestamp)[:6], info.date_time)
434
434
 
435
435
 
436
436
class TestSmartServerExport(TestCaseWithTransport):