/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-12 14:29:32 UTC
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061012142932-7221fe16d2b48fa3
Shuffle http related test code. Hopefully it ends up at the right place :)

* bzrlib/tests/HttpServer.py: 
New file. bzrlib.tests.ChrootedTestCase use HttpServer. So the
class can't be defined in bzrlib.tests.HTTPUtils because it
creates a circular dependency (bzrlib.tests.HTTPUtils needs to
import bzrlib.tests).

* bzrlib/transport/http/_urllib.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/_pycurl.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/__init__.py: 
Transfer all test related code to either bzrlib.tests.HttpServer
and bzrlib.tests.HTTPUtils.
Fix all use of TransportNotPossible and InvalidURL by prefixing it
by 'errors.' (this seems to be the preferred way in the rest of
bzr).
Get rid of unused imports.

* bzrlib/tests/test_transport.py:
(ReadonlyDecoratorTransportTest.test_local_parameters,
FakeNFSDecoratorTests.test_http_parameters): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_sftp_transport.py:
(set_test_transport_to_sftp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_selftest.py:
(TestTestCaseWithTransport.test_get_readonly_url_http): Use
HttpServer from bzrlib.tests.HttpServer instead of
bzrlib.transport.http.

* bzrlib/tests/test_repository.py: 
Does *not* use HttpServer.

* bzrlib/tests/test_http.py: 
Build on top of bzrlib.tests.HttpServer and bzrlib.tests.HTTPUtils
instead of bzrlib.transport.http.

* bzrlib/tests/test_bzrdir.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_http.py:
(HTTPBranchTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_branch.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/__init__.py:
(ChrootedTestCase.setUp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
 
1
# Copyright (C) 2006 by Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
from bzrlib import merge, tests
 
19
 
 
20
 
 
21
class TestRevert(tests.TestCaseWithTransport):
 
22
    """Ensure that revert behaves as expected"""
 
23
 
 
24
    def test_revert_merged_dir(self):
 
25
        """Reverting a merge that adds a directory deletes the directory"""
 
26
        source_tree = self.make_branch_and_tree('source')
 
27
        source_tree.commit('empty tree')
 
28
        target_tree = source_tree.bzrdir.sprout('target').open_workingtree()
 
29
        self.build_tree(['source/dir/', 'source/dir/contents'])
 
30
        source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
 
31
        source_tree.commit('added dir')
 
32
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(), 
 
33
                          target_tree.basis_tree(), this_tree=target_tree)
 
34
        self.failUnlessExists('target/dir')
 
35
        self.failUnlessExists('target/dir/contents')
 
36
        target_tree.revert([])
 
37
        self.failIfExists('target/dir/contents')
 
38
        self.failIfExists('target/dir')
 
39
 
 
40
    def test_revert_new(self):
 
41
        """Only locally-changed new files should be preserved when reverting
 
42
 
 
43
        When a file isn't present in revert's target tree:
 
44
        If a file hasn't been committed, revert should unversion it, but not
 
45
        delete it.
 
46
        If a file has local changes, revert should unversion it, but not
 
47
        delete it.
 
48
        If a file has no changes from the last commit, revert should delete it.
 
49
        If a file has changes due to a merge, revert should delete it.
 
50
        """
 
51
        tree = self.make_branch_and_tree('tree')
 
52
        tree.commit('empty tree')
 
53
        merge_target = tree.bzrdir.sprout('merge_target').open_workingtree()
 
54
        self.build_tree(['tree/new_file'])
 
55
 
 
56
        # newly-added files should not be deleted
 
57
        tree.add('new_file')
 
58
        basis_tree = tree.basis_tree()
 
59
        tree.revert([])
 
60
        self.failUnlessExists('tree/new_file')
 
61
 
 
62
        # unchanged files should be deleted
 
63
        tree.add('new_file')
 
64
        tree.commit('add new_file')
 
65
        tree.revert([], old_tree=basis_tree)
 
66
        self.failIfExists('tree/new_file')
 
67
        
 
68
        # files should be deleted if their changes came from merges
 
69
        merge_target.merge_from_branch(tree.branch)
 
70
        self.failUnlessExists('merge_target/new_file')
 
71
        merge_target.revert([])
 
72
        self.failIfExists('merge_target/new_file')
 
73
 
 
74
        # files should not be deleted if changed after a merge
 
75
        merge_target.merge_from_branch(tree.branch)
 
76
        self.failUnlessExists('merge_target/new_file')
 
77
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
 
78
        merge_target.revert([])
 
79
        self.failUnlessExists('merge_target/new_file')