← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
22
22
 
23
23
import os
24
24
 
25
 
from bzrlib.tests import TestCaseInTempDir
26
25
from bzrlib.branch import Branch
 
26
from bzrlib.osutils import pathjoin
 
27
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
27
28
from bzrlib.trace import mutter
28
 
from bzrlib.osutils import pathjoin
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
31
 
122
122
        check(b, False)
123
123
 
124
124
 
125
 
class SubdirCommit(TestCaseInTempDir):
 
125
class SubdirCommit(TestCaseWithTransport):
126
126
 
127
127
    def test_subdir_commit(self):
128
 
        """Test committing a subdirectory, and committing within a directory."""
129
 
        run_bzr = self.run_bzr
130
 
        eq = self.assertEqual
131
 
 
 
128
        """Test committing a subdirectory, and committing a directory."""
 
129
        tree = self.make_branch_and_tree('.')
 
130
        b = tree.branch
132
131
        self.build_tree(['a/', 'b/'])
133
 
 
134
 
        run_bzr('init')
135
 
        b = Branch.open(u'.')
136
 
 
137
 
        for fn in ('a/one', 'b/two', 'top'):
138
 
            file(fn, 'w').write('old contents')
139
 
 
140
 
        run_bzr('add')
141
 
        run_bzr(['commit', '-m', 'first revision'])
142
 
 
143
 
        for fn in ('a/one', 'b/two', 'top'):
144
 
            file(fn, 'w').write('new contents')
 
132
        def set_contents(contents):
 
133
            self.build_tree_contents([
 
134
                ('a/one', contents),
 
135
                ('b/two', contents),
 
136
                ('top', contents),
 
137
                ])
 
138
        set_contents('old contents')
 
139
        tree.smart_add(['.'])
 
140
        tree.commit('first revision')
 
141
        set_contents('new contents')
145
142
 
146
143
        mutter('start selective subdir commit')
147
 
        run_bzr(['commit', 'a', '-m', 'commit a only'])
 
144
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
148
145
 
149
 
        old = b.repository.revision_tree(b.get_rev_id(1))
150
146
        new = b.repository.revision_tree(b.get_rev_id(2))
151
147
        new.lock_read()
152
148
 
153
 
        eq(new.get_file_by_path('b/two').read(), 'old contents')
154
 
        eq(new.get_file_by_path('top').read(), 'old contents')
155
 
        eq(new.get_file_by_path('a/one').read(), 'new contents')
 
149
        self.assertEqual(new.get_file_by_path('b/two').read(), 'old contents')
 
150
        self.assertEqual(new.get_file_by_path('top').read(), 'old contents')
 
151
        self.assertEqual(new.get_file_by_path('a/one').read(), 'new contents')
156
152
        new.unlock()
157
153
 
158
154
        os.chdir('a')
159
155
        # commit from here should do nothing
160
 
        run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
 
156
        self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
161
157
        v3 = b.repository.revision_tree(b.get_rev_id(3))
162
158
        v3.lock_read()
163
 
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
164
 
        eq(v3.get_file_by_path('top').read(), 'old contents')
165
 
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
 
159
        self.assertEqual(v3.get_file_by_path('b/two').read(), 'old contents')
 
160
        self.assertEqual(v3.get_file_by_path('top').read(), 'old contents')
 
161
        self.assertEqual(v3.get_file_by_path('a/one').read(), 'new contents')
166
162
        v3.unlock()
167
163
 
168
164
        # commit in subdirectory commits whole tree
169
 
        run_bzr(['commit', '-m', 'commit whole tree from subdir'])
 
165
        self.run_bzr(['commit', '-m', 'commit whole tree from subdir'])
170
166
        v4 = b.repository.revision_tree(b.get_rev_id(4))
171
167
        v4.lock_read()
172
 
        eq(v4.get_file_by_path('b/two').read(), 'new contents')
173
 
        eq(v4.get_file_by_path('top').read(), 'new contents')
 
168
        self.assertEqual(v4.get_file_by_path('b/two').read(), 'new contents')
 
169
        self.assertEqual(v4.get_file_by_path('top').read(), 'new contents')
174
170
        v4.unlock()
175
171
 
176
172
        # TODO: factor out some kind of assert_tree_state() method
177
 
 
178
 
 
179
 
if __name__ == '__main__':
180
 
    import unittest
181
 
    unittest.main()