2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
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 |
"""Black-box tests for bzr branch."""
|
|
19 |
||
20 |
import os |
|
21 |
||
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
22 |
from bzrlib import branch, bzrdir |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
23 |
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1 |
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
24 |
from bzrlib.tests.blackbox import ExternalBase |
2485.8.59
by Vincent Ladeuil
Update from review comments. |
25 |
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer |
1711.2.6
by John Arbash Meinel
Creating a test case for bug 43713, bzr branch does the right thing |
26 |
from bzrlib.workingtree import WorkingTree |
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
27 |
|
28 |
||
29 |
class TestBranch(ExternalBase): |
|
30 |
||
2664.8.2
by Daniel Watkins
tests.blackbox.test_branch now uses internals where appropriate. |
31 |
def example_branch(self, path='.'): |
32 |
tree = self.make_branch_and_tree(path) |
|
33 |
self.build_tree_contents([(path + '/hello', 'foo')]) |
|
34 |
tree.add('hello') |
|
35 |
tree.commit(message='setup') |
|
36 |
self.build_tree_contents([(path + '/goodbye', 'baz')]) |
|
37 |
tree.add('goodbye') |
|
38 |
tree.commit(message='setup') |
|
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
39 |
|
40 |
def test_branch(self): |
|
41 |
"""Branch from one branch to another."""
|
|
2664.8.2
by Daniel Watkins
tests.blackbox.test_branch now uses internals where appropriate. |
42 |
self.example_branch('a') |
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
43 |
self.run_bzr('branch a b') |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
44 |
b = branch.Branch.open('b') |
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
45 |
self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read()) |
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
46 |
self.run_bzr('branch a c -r 1') |
2664.8.2
by Daniel Watkins
tests.blackbox.test_branch now uses internals where appropriate. |
47 |
b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True) |
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
48 |
|
1711.2.6
by John Arbash Meinel
Creating a test case for bug 43713, bzr branch does the right thing |
49 |
def test_branch_only_copies_history(self): |
50 |
# Knit branches should only push the history for the current revision.
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
51 |
format = bzrdir.BzrDirMetaFormat1() |
1711.2.6
by John Arbash Meinel
Creating a test case for bug 43713, bzr branch does the right thing |
52 |
format.repository_format = RepositoryFormatKnit1() |
53 |
shared_repo = self.make_repository('repo', format=format, shared=True) |
|
54 |
shared_repo.set_make_working_trees(True) |
|
55 |
||
56 |
def make_shared_tree(path): |
|
57 |
shared_repo.bzrdir.root_transport.mkdir(path) |
|
58 |
shared_repo.bzrdir.create_branch_convenience('repo/' + path) |
|
59 |
return WorkingTree.open('repo/' + path) |
|
60 |
tree_a = make_shared_tree('a') |
|
61 |
self.build_tree(['repo/a/file']) |
|
62 |
tree_a.add('file') |
|
63 |
tree_a.commit('commit a-1', rev_id='a-1') |
|
64 |
f = open('repo/a/file', 'ab') |
|
65 |
f.write('more stuff\n') |
|
66 |
f.close() |
|
67 |
tree_a.commit('commit a-2', rev_id='a-2') |
|
68 |
||
69 |
tree_b = make_shared_tree('b') |
|
70 |
self.build_tree(['repo/b/file']) |
|
71 |
tree_b.add('file') |
|
72 |
tree_b.commit('commit b-1', rev_id='b-1') |
|
73 |
||
74 |
self.assertTrue(shared_repo.has_revision('a-1')) |
|
75 |
self.assertTrue(shared_repo.has_revision('a-2')) |
|
76 |
self.assertTrue(shared_repo.has_revision('b-1')) |
|
77 |
||
78 |
# Now that we have a repository with shared files, make sure
|
|
79 |
# that things aren't copied out by a 'branch'
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
80 |
self.run_bzr('branch repo/b branch-b') |
1711.2.6
by John Arbash Meinel
Creating a test case for bug 43713, bzr branch does the right thing |
81 |
pushed_tree = WorkingTree.open('branch-b') |
82 |
pushed_repo = pushed_tree.branch.repository |
|
83 |
self.assertFalse(pushed_repo.has_revision('a-1')) |
|
84 |
self.assertFalse(pushed_repo.has_revision('a-2')) |
|
85 |
self.assertTrue(pushed_repo.has_revision('b-1')) |
|
86 |
||
1711.2.5
by John Arbash Meinel
Factoring blackbox tests into their own file. |
87 |
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
88 |
class TestRemoteBranch(TestCaseWithSFTPServer): |
89 |
||
90 |
def setUp(self): |
|
91 |
super(TestRemoteBranch, self).setUp() |
|
92 |
tree = self.make_branch_and_tree('branch') |
|
93 |
self.build_tree_contents([('branch/file', 'file content\n')]) |
|
94 |
tree.add('file') |
|
95 |
tree.commit('file created') |
|
96 |
||
97 |
def test_branch_local_remote(self): |
|
98 |
self.run_bzr(['branch', 'branch', self.get_url('remote')]) |
|
99 |
t = self.get_transport() |
|
2485.8.62
by Vincent Ladeuil
From review comments, fix typos and deprecate some functions. |
100 |
# Ensure that no working tree what created remotely
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
101 |
self.assertFalse(t.has('remote/file')) |
102 |
||
103 |
def test_branch_remote_remote(self): |
|
104 |
# Light cheat: we access the branch remotely
|
|
105 |
self.run_bzr(['branch', self.get_url('branch'), |
|
106 |
self.get_url('remote')]) |
|
107 |
t = self.get_transport() |
|
2485.8.62
by Vincent Ladeuil
From review comments, fix typos and deprecate some functions. |
108 |
# Ensure that no working tree what created remotely
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
109 |
self.assertFalse(t.has('remote/file')) |
110 |