Rev 2647: Fix deprecation warnings on benchmarks (Lukas Lalinsky) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Jul 22 19:54:04 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2647
revision-id: pqm at pqm.ubuntu.com-20070722185402-a7ib57fehfwd03jy
parent: pqm at pqm.ubuntu.com-20070722180904-wy7y7oyi32wbghgf
parent: aaron.bentley at utoronto.ca-20070722173807-mh2prixtof3274ng
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-07-22 19:54:02 +0100
message:
Fix deprecation warnings on benchmarks (Lukas Lalinsky)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
------------------------------------------------------------
revno: 2645.1.2
merged: aaron.bentley at utoronto.ca-20070722173807-mh2prixtof3274ng
parent: aaron.bentley at utoronto.ca-20070722173622-1p4mw28bzp1qangs
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2007-07-22 13:38:07 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2645.1.1
merged: aaron.bentley at utoronto.ca-20070722173622-1p4mw28bzp1qangs
parent: pqm at pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
parent: lalinsky at gmail.com-20070722120819-txzu81te3zc2m72v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2007-07-22 13:36:22 -0400
message:
Fix deprecation warnings on benchmarks (Lukáš Lalinský)
------------------------------------------------------------
revno: 2644.2.1
merged: lalinsky at gmail.com-20070722120819-txzu81te3zc2m72v
parent: pqm at pqm.ubuntu.com-20070720233740-hjfxo6dx2ytwkros
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.benchmarks
timestamp: Sun 2007-07-22 14:08:19 +0200
message:
Fix deprecation warnings on benchmarks.
=== modified file 'NEWS'
--- a/NEWS 2007-07-22 17:19:18 +0000
+++ b/NEWS 2007-07-22 18:54:02 +0000
@@ -23,6 +23,9 @@
have been renamed but not otherwise modified. (Marius Kruger,
#111664)
+ * ``bzr selftest --bench`` no longer emits deprecation warnings
+ (Lukáš Lalinský)
+
IMPROVEMENTS:
* Don't show "dots" progress indicators when run non-interactively, such
=== modified file 'bzrlib/benchmarks/bench_bundle.py'
--- a/bzrlib/benchmarks/bench_bundle.py 2006-12-01 19:41:16 +0000
+++ b/bzrlib/benchmarks/bench_bundle.py 2007-07-22 12:08:19 +0000
@@ -39,17 +39,17 @@
or added and one commit.
"""
self.make_kernel_like_committed_tree()
- self.time(self.run_bzr, 'bundle', '--revision', '..-1')
+ self.time(self.run_bzr, ['bundle', '--revision', '..-1'])
def test_create_bundle_many_commit_tree (self):
"""Create a bundle for a tree with many commits but no changes."""
self.make_many_commit_tree()
- self.time(self.run_bzr, 'bundle', '--revision', '..-1')
+ self.time(self.run_bzr, ['bundle', '--revision', '..-1'])
def test_create_bundle_heavily_merged_tree(self):
"""Create a bundle for a heavily merged tree."""
self.make_heavily_merged_tree()
- self.time(self.run_bzr, 'bundle', '--revision', '..-1')
+ self.time(self.run_bzr, ['bundle', '--revision', '..-1'])
def test_apply_bundle_known_kernel_like_tree(self):
"""Create a bundle for a kernel sized tree with no ignored, unknowns,
@@ -66,7 +66,7 @@
tree2 = self.make_branch_and_tree('branch_a')
os.chdir('branch_a')
- self.time(self.run_bzr, 'merge', '../bundle')
+ self.time(self.run_bzr, ['merge', '../bundle'])
class BundleLibraryLevelWriteBenchmark(Benchmark):
=== modified file 'bzrlib/benchmarks/bench_checkout.py'
--- a/bzrlib/benchmarks/bench_checkout.py 2007-04-09 22:11:22 +0000
+++ b/bzrlib/benchmarks/bench_checkout.py 2007-07-22 12:08:19 +0000
@@ -26,4 +26,4 @@
def test_build_kernel_like_tree(self):
"""Checkout of a clean kernel sized tree should be (<10secs)."""
self.make_kernel_like_committed_tree(link_bzr=True)
- self.time(self.run_bzr, 'checkout', '--lightweight', '.', 'acheckout')
+ self.time(self.run_bzr, ['checkout', '--lightweight', '.', 'acheckout'])
=== modified file 'bzrlib/benchmarks/bench_commit.py'
--- a/bzrlib/benchmarks/bench_commit.py 2007-04-09 22:11:22 +0000
+++ b/bzrlib/benchmarks/bench_commit.py 2007-07-22 12:08:19 +0000
@@ -33,17 +33,17 @@
# self.transport_server = MemoryServer
# self.make_kernel_like_tree(self.get_url())
tree = self.make_kernel_like_added_tree()
- self.time(self.run_bzr, 'commit', '-m', 'first post')
+ self.time(self.run_bzr, ['commit', '-m', 'first post'])
def test_partial_commit_kernel_like_tree(self):
"""Commit of 1/8th of a fresh import of a clean kernel sized tree."""
tree = self.make_kernel_like_added_tree()
- self.time(self.run_bzr, 'commit', '-m', 'first post', '1')
+ self.time(self.run_bzr, ['commit', '-m', 'first post', '1'])
def test_no_op_commit_in_kernel_like_tree(self):
"""Run commit --unchanged in a kernel sized tree"""
tree = self.make_kernel_like_committed_tree()
- self.time(self.run_bzr, 'commit', '-m', 'no changes', '--unchanged')
+ self.time(self.run_bzr, ['commit', '-m', 'no changes', '--unchanged'])
def test_commit_one_in_kernel_like_tree(self):
"""Time committing a single change, when not directly specified"""
@@ -52,7 +52,7 @@
# working-tree is hardlinked, so replace a file and commit the change
os.remove('4/4/4/4')
open('4/4/4/4', 'wb').write('new contents\n')
- self.time(self.run_bzr, 'commit', '-m', 'second')
+ self.time(self.run_bzr, ['commit', '-m', 'second'])
def test_partial_commit_one_in_kernel_like_tree(self):
"""Time committing a single change when it is directly specified"""
@@ -61,7 +61,7 @@
# working-tree is hardlinked, so replace a file and commit the change
os.remove('4/4/4/4')
open('4/4/4/4', 'wb').write('new contents\n')
- self.time(self.run_bzr, 'commit', '-m', 'second', '4/4/4/4')
+ self.time(self.run_bzr, ['commit', '-m', 'second', '4/4/4/4'])
def make_simple_tree(self):
"""A small, simple tree. No caching needed"""
@@ -73,7 +73,7 @@
def test_cmd_commit(self):
"""Test execution of simple commit"""
tree = self.make_simple_tree()
- self.time(self.run_bzr, 'commit', '-m', 'init simple tree')
+ self.time(self.run_bzr, ['commit', '-m', 'init simple tree'])
def test_cmd_commit_subprocess(self):
"""Text startup and execution of a simple commit."""
=== modified file 'bzrlib/benchmarks/bench_log.py'
--- a/bzrlib/benchmarks/bench_log.py 2007-04-09 22:11:22 +0000
+++ b/bzrlib/benchmarks/bench_log.py 2007-07-22 12:08:19 +0000
@@ -103,7 +103,7 @@
def test_cmd_log(self):
"""Test execution of the log command."""
tree = self.make_many_commit_tree(hardlink=True)
- self.time(self.run_bzr, 'log', '-r', '-4..')
+ self.time(self.run_bzr, ['log', '-r', '-4..'])
def test_cmd_log_subprocess(self):
"""Text startup and execution of the log command."""
=== modified file 'bzrlib/benchmarks/bench_status.py'
--- a/bzrlib/benchmarks/bench_status.py 2007-04-09 22:11:22 +0000
+++ b/bzrlib/benchmarks/bench_status.py 2007-07-22 12:08:19 +0000
@@ -42,11 +42,11 @@
of a single file."""
self.make_kernel_like_committed_tree()
#XXX depends on the filenames generated by make_kernel_like_tree
- self.time(self.run_bzr, 'status', '7/4/0/16')
+ self.time(self.run_bzr, ['status', '7/4/0/16'])
def test_status_one_added_file_kernel_like_tree(self):
"""Status of a single added file in our stock large tree."""
self.make_kernel_like_tree()
self.run_bzr('add')
- self.run_bzr('commit', '-m', 'initial import')
- self.time(self.run_bzr, 'status', '3/3/3/10')
+ self.run_bzr(['commit', '-m', 'initial import'])
+ self.time(self.run_bzr, ['status', '3/3/3/10'])
More information about the bazaar-commits
mailing list