← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-26 06:34:07 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050826063406-84d09e206c6c5e73
Shortened conflict markers to 7 characters, to please smerge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
22
22
 
23
23
 
24
24
import os
25
 
 
26
 
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
 
25
from bzrlib.selftest import InTempDir, BzrTestBase
27
26
from bzrlib.branch import Branch
28
27
 
29
 
import logging
30
 
logger = logging.getLogger('bzr.test.versioning')
31
 
debug = logger.debug
32
 
 
33
 
 
34
 
class TestVersioning(TestCaseInTempDir):
35
 
    
36
 
    def test_mkdir(self): 
 
28
 
 
29
class Mkdir(InTempDir):
 
30
    def runTest(self): 
37
31
        """Basic 'bzr mkdir' operation"""
38
32
        from bzrlib.commands import run_bzr
39
33
 
55
49
        self.assertEquals(delta.added[0][0], 'foo')
56
50
        self.failIf(delta.modified)
57
51
 
58
 
    def test_add_in_unversioned(self):
 
52
 
 
53
 
 
54
class AddInUnversioned(InTempDir):
 
55
    def runTest(self):
59
56
        """Try to add a file in an unversioned directory.
60
57
 
61
58
        smart_add may eventually add the parent as necessary, but simple
73
70
                          b.add,
74
71
                          'foo/hello')
75
72
        
76
 
        self.check_and_upgrade()
77
 
 
78
 
        
79
 
    def test_subdir_add(self):
80
 
        """Add in subdirectory should add only things from there down"""
81
 
        
82
 
        from bzrlib.branch import Branch
83
 
        from bzrlib.commands import run_bzr
84
 
        
85
 
        eq = self.assertEqual
86
 
        ass = self.assert_
87
 
        chdir = os.chdir
88
 
        
89
 
        b = Branch('.', init=True)
90
 
        self.build_tree(['src/', 'README'])
91
 
        
92
 
        eq(sorted(b.unknowns()),
93
 
           ['README', 'src'])
94
 
        
95
 
        eq(run_bzr(['add', 'src']), 0)
96
 
        
97
 
        self.build_tree(['src/foo.c'])
98
 
        
99
 
        chdir('src')
100
 
        eq(run_bzr(['add']), 0)
101
 
        
102
 
        eq(sorted(b.unknowns()), 
103
 
           ['README'])
104
 
        eq(len(b.inventory), 3)
105
 
                
106
 
        chdir('..')
107
 
        eq(run_bzr(['add']), 0)
108
 
        eq(list(b.unknowns()), [])
109
 
 
110
 
        self.check_and_upgrade()
111
 
 
112
 
 
113
 
    def check_and_upgrade(self):
114
 
        """After all the above changes, run the check and upgrade commands.
115
 
 
116
 
        The upgrade should be a no-op."""
117
 
        from bzrlib.commands import run_bzr
118
 
        b = Branch('.')
119
 
        debug('branch has %d revisions', b.revno())
120
 
        
121
 
        debug('check branch...')
122
 
        from bzrlib.check import check
123
 
        check(b)
124
 
        
125
 
        debug('upgrade branch...')
126
 
        from bzrlib.upgrade import upgrade
127
 
        upgrade(b)
128
 
        
129
 
        debug('check branch...')
130
 
        from bzrlib.check import check
131
 
        check(b)
132
 
        
133
 
 
134
 
        
135
 
        
136
 
class SubdirCommit(TestCaseInTempDir):
137
 
 
138
 
    def test_subdir_commit(self):
 
73
        
 
74
class SubdirCommit(BzrTestBase):
 
75
    def runTest(self):
139
76
        """Test committing a subdirectory, and committing within a directory."""
140
77
        run_bzr = self.run_bzr
141
78
        eq = self.assertEqual
179
116
        
180
117
        # TODO: factor out some kind of assert_tree_state() method
181
118
        
 
119
        
 
120
        
 
121
class SubdirAdd(InTempDir):
 
122
    def runTest(self):
 
123
        """Add in subdirectory should add only things from there down"""
 
124
        
 
125
        from bzrlib.branch import Branch
 
126
        from bzrlib.commands import run_bzr
 
127
        
 
128
        eq = self.assertEqual
 
129
        ass = self.assert_
 
130
        chdir = os.chdir
 
131
        
 
132
        b = Branch('.', init=True)
 
133
        self.build_tree(['src/', 'README'])
 
134
        
 
135
        eq(sorted(b.unknowns()),
 
136
           ['README', 'src'])
 
137
        
 
138
        eq(run_bzr(['add', 'src']), 0)
 
139
        
 
140
        self.build_tree(['src/foo.c'])
 
141
        
 
142
        chdir('src')
 
143
        eq(run_bzr(['add']), 0)
 
144
        
 
145
        eq(sorted(b.unknowns()), 
 
146
           ['README'])
 
147
        eq(len(b.inventory), 3)
 
148
                
 
149
        chdir('..')
 
150
        eq(run_bzr(['add']), 0)
 
151
        eq(list(b.unknowns()), [])
 
152