~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_export.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
 
 
18
import time
19
19
 
20
20
from bzrlib import (
21
21
    errors,
73
73
        export.export(wtree, 'target2', format='dir', subdir='dir2/second')
74
74
        self.failUnlessExists('target2/second')
75
75
        
 
76
    def test_dir_export_files_same_timestamp(self):
 
77
        builder = self.make_branch_builder('source')
 
78
        builder.start_series()
 
79
        builder.build_snapshot(None, None, [
 
80
            ('add', ('', 'root-id', 'directory', '')),
 
81
            ('add', ('a', 'a-id', 'file', 'content\n'))])
 
82
        builder.build_snapshot(None, None, [
 
83
            ('add', ('b', 'b-id', 'file', 'content\n'))])
 
84
        builder.finish_series()
 
85
        b = builder.get_branch()
 
86
        b.lock_read()
 
87
        self.addCleanup(b.unlock)
 
88
        tree = b.basis_tree()
 
89
        orig_iter_files_bytes = tree.iter_files_bytes
 
90
        # Make iter_files_bytes slower, so we provoke mtime skew
 
91
        def iter_files_bytes(to_fetch):
 
92
            for thing in orig_iter_files_bytes(to_fetch):
 
93
                yield thing
 
94
                time.sleep(1)
 
95
        tree.iter_files_bytes = iter_files_bytes
 
96
        export.export(tree, 'target', format='dir')
 
97
        t = self.get_transport('target')
 
98
        st_a = t.stat('a')
 
99
        st_b = t.stat('b')
 
100
        # All files must be given the same mtime.
 
101
        self.assertEqual(st_a.st_mtime, st_b.st_mtime)