← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2007-06-26 20:32:49 UTC
  • mto: (2581.1.1 cleanup-runbzr)
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: v.ladeuil+lp@free.fr-20070626203249-sqm4afiai5dxofum
Deprecate the varargs syntax and fix the tests.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Activate the deprecation warning.
(TestCase.run_bzr_error): Add error_regexes to kwargs or run_bzr
get confused.

* bzrlib/tests/blackbox/test_selftest.py:
(TestRunBzr.test_args): Activate.

* bzrlib/tests/blackbox/test_inventory.py:
(TestInventory.assertInventoryEqual): Build the command from args
if not None.

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.ls_equals): Build the command from args if not None.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_lightweight_checkout_explicit):
Nice catch, we were calling run_bzr instead of run_bzr_error. This
went unnoticed for some time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_version_info.py
24
24
class TestVersionInfo(TestCaseWithTransport):
25
25
 
26
26
    def test_invalid_format(self):
27
 
        self.run_bzr('version-info', '--format', 'quijibo', retcode=3)
 
27
        self.run_bzr('version-info --format quijibo', retcode=3)
28
28
 
29
29
    def create_tree(self):
30
30
        wt = self.make_branch_and_tree('branch')
43
43
    def test_basic(self):
44
44
        self.create_tree()
45
45
 
46
 
        txt = self.run_bzr('version-info', 'branch')[0]
 
46
        txt = self.run_bzr('version-info branch')[0]
47
47
        self.assertContainsRe(txt, 'date:')
48
48
        self.assertContainsRe(txt, 'build-date:')
49
49
        self.assertContainsRe(txt, 'revno: 2')
52
52
    def test_all(self):
53
53
        """'--all' includes clean, revision history, and file revisions"""
54
54
        self.create_tree()
55
 
        txt = self.run_bzr('version-info', 'branch',
56
 
                           '--all')[0]
 
55
        txt = self.run_bzr('version-info branch --all')[0]
57
56
        self.assertContainsRe(txt, 'date:')
58
57
        self.assertContainsRe(txt, 'revno: 2')
59
58
        self.assertContainsRe(txt, 'revision-id: ' + self.revisions[-1])
71
70
        """Test that --check-clean includes the right info"""
72
71
        self.create_tree()
73
72
 
74
 
        txt = self.run_bzr('version-info', 'branch',
75
 
                           '--check-clean')[0]
 
73
        txt = self.run_bzr('version-info branch --check-clean')[0]
76
74
        self.assertContainsRe(txt, 'clean: True')
77
75
 
78
76
        self.build_tree_contents([('branch/c', 'now unclean\n')])
79
 
        txt = self.run_bzr('version-info', 'branch',
80
 
                           '--check-clean')[0]
 
77
        txt = self.run_bzr('version-info branch --check-clean')[0]
81
78
        self.assertContainsRe(txt, 'clean: False')
82
79
 
83
 
        txt = self.run_bzr('version-info', 'branch',
84
 
                           '--check-clean', '--include-file-revisions')[0]
 
80
        txt = self.run_bzr('version-info branch --check-clean'
 
81
                           ' --include-file-revisions')[0]
85
82
        self.assertContainsRe(txt, 'revision: unversioned')
86
83
 
87
84
        os.remove('branch/c')
91
88
        branch = self.make_branch('just_branch')
92
89
        branch.pull(tree.branch)
93
90
 
94
 
        txt = self.run_bzr('version-info', 'just_branch')[0]
 
91
        txt = self.run_bzr('version-info just_branch')[0]
95
92
        self.assertStartsWith(txt, 'revision-id: r2\n')
96
93
 
97
94
    def assertEqualNoBuildDate(self, text1, text2):
114
111
        """Test that bzr defaults to the local working directory"""
115
112
        self.create_tree()
116
113
 
117
 
        txt1 = self.run_bzr('version-info', 'branch')[0]
 
114
        txt1 = self.run_bzr('version-info branch')[0]
118
115
 
119
116
        os.chdir('branch')
120
117
        txt2 = self.run_bzr('version-info')[0]
124
121
        """Test that we can pass --format=rio"""
125
122
        self.create_tree()
126
123
 
127
 
        txt = self.run_bzr('version-info', 'branch')[0]
128
 
        txt1 = self.run_bzr('version-info', '--format', 'rio', 'branch')[0]
129
 
        txt2 = self.run_bzr('version-info', '--format=rio', 'branch')[0]
 
124
        txt = self.run_bzr('version-info branch')[0]
 
125
        txt1 = self.run_bzr('version-info --format rio branch')[0]
 
126
        txt2 = self.run_bzr('version-info --format=rio branch')[0]
130
127
        self.assertEqualNoBuildDate(txt, txt1)
131
128
        self.assertEqualNoBuildDate(txt, txt2)
132
129
 
134
131
        """Test that we can do --format=python"""
135
132
        self.create_tree()
136
133
 
137
 
        txt = self.run_bzr('version-info', '--format', 'python', 'branch')[0]
 
134
        txt = self.run_bzr('version-info --format python branch')[0]
138
135
 
139
136
        self.assertContainsRe(txt, 'version_info = {')