Bazaar Usertest

Merge lp:~mbp/bzr-usertest/trivial into lp:~bzr/bzr-usertest/trunk-old

  1. trivial
  2. Merge into trunk-old
Proposed by Martin Pool
Status: Merged
Approved by: Robert Collins
Approved revision: 154
Merge reported by: Ian Clatworthy
Merged at revision: not available
Proposed branch: lp:~mbp/bzr-usertest/trivial
Merge into: lp:~bzr/bzr-usertest/trunk-old
Diff against target: None lines
To merge this branch: bzr merge lp:~mbp/bzr-usertest/trivial
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Ian Clatworthy Pending
Review via email: mp+7532@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

This adds some help and gives better messages in two error cases.

Revision history for this message
Robert Collins (lifeless) wrote :

+1

review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

Martin, I think you should just land this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2009-02-26 09:44:53 +0000
3+++ __init__.py 2009-02-27 06:49:30 +0000
4@@ -1,4 +1,4 @@
5-# Copyright (C) 2007 Canonical Ltd
6+# Copyright (C) 2007, 2009 Canonical Ltd
7 #
8 # This program is free software; you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10@@ -397,9 +397,14 @@
11 class cmd_usertestcompare(Command):
12 """Generate a comparison report on csv data produced by userteststats.
13
14- The CSV files must have names of the form $tool-$suite-$scenario.csv
15- (where the components do not contain dashes) and the suite name corresponds
16- to the usertest suite used to generate the data, e.g. "common" or "log".
17+ The CSV files must have names of the form $tool-$suite-$scenario.csv:
18+
19+ * $tool is the name of the tool used in the run, like "bzr-1.12". It
20+ may optionally have a version, separated by a dash.
21+ * $suite is the usertest suite used to generate the data, e.g. "common"
22+ or "log"; it must not contain a dash.
23+ * $scenario is an arbitrary name for the scenario being tested, again
24+ containing no dashes.
25 """
26 hidden = True
27 takes_args = ['csv_files+']
28
29=== modified file 'suiterunner.py'
30--- suiterunner.py 2009-02-23 04:17:18 +0000
31+++ suiterunner.py 2009-02-27 06:52:34 +0000
32@@ -24,7 +24,7 @@
33 import sys
34 import time
35
36-from bzrlib.trace import info, warning, error
37+from bzrlib.trace import info, warning, error, log_exception_quietly
38 import archiveutil
39 import datadump
40 import dirutil
41@@ -58,7 +58,7 @@
42 try:
43 module = __import__(module_name, globals(), locals())
44 except ImportError, e:
45- # TODO: log exception properly
46+ trace.log_exception_quietly()
47 info("failed to find module %s\nerror: %s" % (module_name, e))
48 return None
49 else:
50@@ -66,7 +66,7 @@
51 module = getattr(module, part)
52 fn = getattr(module, 'script_suite', None)
53 if fn is None:
54- # TODO: log exception properly
55+ trace.log_exception_quietly()
56 info("failed to find script_suite() in %s" % module)
57 return None
58 return fn()

Subscribers

People subscribed via source and target branches

to all changes: