|
768
by Martin Pool
- start some tests for directory renames |
1 |
import os |
2 |
import unittest |
|
3 |
||
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
4 |
from bzrlib.tests import TestCaseInTempDir, TestCase |
|
768
by Martin Pool
- start some tests for directory renames |
5 |
from bzrlib.branch import ScratchBranch, Branch |
|
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
6 |
from bzrlib.errors import NotBranchError |
|
1185.31.33
by John Arbash Meinel
A couple more path.join statements needed changing. |
7 |
from bzrlib.osutils import pathjoin |
|
778
by Martin Pool
- simple revert of text files |
8 |
|
9 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
10 |
class TestBranch(TestCaseInTempDir): |
|
1102
by Martin Pool
- merge test refactoring from robertc |
11 |
|
12 |
def test_no_changes(self): |
|
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
13 |
from bzrlib.errors import PointlessCommit |
|
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
14 |
|
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
15 |
b = Branch.initialize(u'.') |
|
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
16 |
|
17 |
self.build_tree(['hello.txt']) |
|
18 |
||
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
19 |
self.assertRaises(PointlessCommit, |
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
20 |
b.working_tree().commit, |
|
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
21 |
'commit without adding', |
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
22 |
allow_pointless=False) |
|
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
23 |
|
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
24 |
b.working_tree().commit('commit pointless tree', |
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
25 |
allow_pointless=True) |
|
883
by Martin Pool
- more tests for detecting empty commits |
26 |
|
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
27 |
b.working_tree().add('hello.txt') |
|
883
by Martin Pool
- more tests for detecting empty commits |
28 |
|
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
29 |
b.working_tree().commit('commit first added file', |
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
30 |
allow_pointless=False) |
|
883
by Martin Pool
- more tests for detecting empty commits |
31 |
|
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
32 |
self.assertRaises(PointlessCommit, |
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
33 |
b.working_tree().commit, |
|
883
by Martin Pool
- more tests for detecting empty commits |
34 |
'commit after adding file', |
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
35 |
allow_pointless=False) |
|
883
by Martin Pool
- more tests for detecting empty commits |
36 |
|
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
37 |
b.working_tree().commit('commit pointless revision with one file', |
|
885
by Martin Pool
- commit command refuses unless something is changed or --unchanged is given |
38 |
allow_pointless=True) |
|
883
by Martin Pool
- more tests for detecting empty commits |
39 |
|
|
811
by Martin Pool
- Test case for validate_revision_id |
40 |
|
|
1278
by Martin Pool
- remove test that tried to commit absent parents |
41 |
class MoreTests(TestCaseInTempDir): |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
42 |
|
|
1102
by Martin Pool
- merge test refactoring from robertc |
43 |
def test_rename_dirs(self): |
44 |
"""Test renaming directories and the files within them."""
|
|
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
45 |
b = Branch.initialize(u'.') |
|
768
by Martin Pool
- start some tests for directory renames |
46 |
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file']) |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
47 |
b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file']) |
|
768
by Martin Pool
- start some tests for directory renames |
48 |
|
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
49 |
b.working_tree().commit('create initial state') |
|
768
by Martin Pool
- start some tests for directory renames |
50 |
|
51 |
# TODO: lift out to a test helper that checks the shape of
|
|
52 |
# an inventory
|
|
53 |
||
54 |
revid = b.revision_history()[0] |
|
55 |
self.log('first revision_id is {%s}' % revid) |
|
56 |
||
57 |
inv = b.get_revision_inventory(revid) |
|
58 |
self.log('contents of inventory: %r' % inv.entries()) |
|
59 |
||
60 |
self.check_inventory_shape(inv, |
|
61 |
['dir', 'dir/sub', 'dir/sub/file']) |
|
62 |
||
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
63 |
b.working_tree().rename_one('dir', 'newdir') |
|
771
by Martin Pool
- more tests of directory renames |
64 |
|
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
65 |
self.check_inventory_shape(b.working_tree().read_working_inventory(), |
|
771
by Martin Pool
- more tests of directory renames |
66 |
['newdir', 'newdir/sub', 'newdir/sub/file']) |
67 |
||
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
68 |
b.working_tree().rename_one('newdir/sub', 'newdir/newsub') |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
69 |
self.check_inventory_shape(b.working_tree().read_working_inventory(), |
|
771
by Martin Pool
- more tests of directory renames |
70 |
['newdir', 'newdir/newsub', |
71 |
'newdir/newsub/file']) |
|
72 |
||
|
1102
by Martin Pool
- merge test refactoring from robertc |
73 |
def test_relpath(self): |
74 |
"""test for branch path lookups
|
|
75 |
|
|
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
76 |
bzrlib.osutils._relpath do a simple but subtle
|
|
1102
by Martin Pool
- merge test refactoring from robertc |
77 |
job: given a path (either relative to cwd or absolute), work out
|
78 |
if it is inside a branch and return the path relative to the base.
|
|
79 |
"""
|
|
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
80 |
from bzrlib.osutils import relpath |
|
601
by Martin Pool
- whitebox tests for branch path handling |
81 |
import tempfile, shutil |
82 |
||
83 |
savedir = os.getcwdu() |
|
84 |
dtmp = tempfile.mkdtemp() |
|
|
907.1.7
by John Arbash Meinel
Fixed test failure on Mac OSX. |
85 |
# On Mac OSX, /tmp actually expands to /private/tmp
|
86 |
dtmp = os.path.realpath(dtmp) |
|
|
601
by Martin Pool
- whitebox tests for branch path handling |
87 |
|
88 |
def rp(p): |
|
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
89 |
return relpath(dtmp, p) |
|
601
by Martin Pool
- whitebox tests for branch path handling |
90 |
|
91 |
try: |
|
92 |
# check paths inside dtmp while standing outside it
|
|
|
1185.31.33
by John Arbash Meinel
A couple more path.join statements needed changing. |
93 |
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo') |
|
601
by Martin Pool
- whitebox tests for branch path handling |
94 |
|
95 |
# root = nothing
|
|
96 |
self.assertEqual(rp(dtmp), '') |
|
97 |
||
98 |
self.assertRaises(NotBranchError, |
|
99 |
rp, |
|
100 |
'/etc') |
|
101 |
||
102 |
# now some near-miss operations -- note that
|
|
103 |
# os.path.commonprefix gets these wrong!
|
|
104 |
self.assertRaises(NotBranchError, |
|
105 |
rp, |
|
106 |
dtmp.rstrip('\\/') + '2') |
|
107 |
||
108 |
self.assertRaises(NotBranchError, |
|
109 |
rp, |
|
110 |
dtmp.rstrip('\\/') + '2/foo') |
|
111 |
||
112 |
# now operations based on relpath of files in current
|
|
113 |
# directory, or nearby
|
|
114 |
os.chdir(dtmp) |
|
115 |
||
|
1185.31.33
by John Arbash Meinel
A couple more path.join statements needed changing. |
116 |
self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux') |
|
601
by Martin Pool
- whitebox tests for branch path handling |
117 |
|
118 |
self.assertEqual(rp('foo'), 'foo') |
|
119 |
||
120 |
self.assertEqual(rp('./foo'), 'foo') |
|
121 |
||
122 |
self.assertEqual(rp(os.path.abspath('foo')), 'foo') |
|
123 |
||
124 |
self.assertRaises(NotBranchError, |
|
125 |
rp, '../foo') |
|
126 |
||
127 |
finally: |
|
128 |
os.chdir(savedir) |
|
129 |
shutil.rmtree(dtmp) |