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 @@
6
1
# Copyright (C) 2007 Canonical Ltd
1
# Copyright (C) 2007, 2009 Canonical Ltd
7
2
#
2
#
8
3
# This program is free software; you can redistribute it and/or modify
3
# This program is free software; you can redistribute it and/or modify
9
4
# it under the terms of the GNU General Public License as published by
4
# it under the terms of the GNU General Public License as published by
10
@@ -397,9 +397,14 @@
11
397
class cmd_usertestcompare(Command):
397
class cmd_usertestcompare(Command):
12
398
    """Generate a comparison report on csv data produced by userteststats.
398
    """Generate a comparison report on csv data produced by userteststats.
13
399
    
399
    
17
400
    The CSV files must have names of the form $tool-$suite-$scenario.csv
400
    The CSV files must have names of the form $tool-$suite-$scenario.csv:
18
401
    (where the components do not contain dashes) and the suite name corresponds
401
19
402
    to the usertest suite used to generate the data, e.g. "common" or "log".
402
    * $tool is the name of the tool used in the run, like "bzr-1.12".  It 
20
403
      may optionally have a version, separated by a dash.
21
404
    * $suite is the usertest suite used to generate the data, e.g. "common"
22
405
      or "log"; it must not contain a dash.
23
406
    * $scenario is an arbitrary name for the scenario being tested, again 
24
407
      containing no dashes.
25
403
    """
408
    """
26
404
    hidden = True
409
    hidden = True
27
405
    takes_args = ['csv_files+']
410
    takes_args = ['csv_files+']
28
406
411
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
24
import sys
24
import sys
34
25
import time
25
import time
35
26
26
37
27
from bzrlib.trace import info, warning, error
27
from bzrlib.trace import info, warning, error, log_exception_quietly
38
28
import archiveutil
28
import archiveutil
39
29
import datadump
29
import datadump
40
30
import dirutil
30
import dirutil
41
@@ -58,7 +58,7 @@
42
58
    try:
58
    try:
43
59
        module = __import__(module_name, globals(), locals())
59
        module = __import__(module_name, globals(), locals())
44
60
    except ImportError, e:
60
    except ImportError, e:
46
61
        # TODO: log exception properly
61
        trace.log_exception_quietly()
47
62
        info("failed to find module %s\nerror: %s" % (module_name, e))
62
        info("failed to find module %s\nerror: %s" % (module_name, e))
48
63
        return None
63
        return None
49
64
    else:
64
    else:
50
@@ -66,7 +66,7 @@
51
66
            module = getattr(module, part)
66
            module = getattr(module, part)
52
67
    fn = getattr(module, 'script_suite', None)
67
    fn = getattr(module, 'script_suite', None)
53
68
    if fn is None:
68
    if fn is None:
55
69
        # TODO: log exception properly
69
        trace.log_exception_quietly()
56
70
        info("failed to find script_suite() in %s" % module)
70
        info("failed to find script_suite() in %s" % module)
57
71
        return None
71
        return None
58
72
    return fn()
72
    return fn()
Status:	Merged
Approved by:	Robert Collins on 2009-11-05
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Robert Collins (community)		Approve on 2009-11-05
Ian Clatworthy	2009-06-17	Pending
Review via email: mp+7532@code.launchpad.net
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 @@
6	1	# Copyright (C) 2007 Canonical Ltd	1	# Copyright (C) 2007, 2009 Canonical Ltd
7	2	#	2	#
8	3	# This program is free software; you can redistribute it and/or modify	3	# This program is free software; you can redistribute it and/or modify
9	4	# it under the terms of the GNU General Public License as published by	4	# it under the terms of the GNU General Public License as published by
10	@@ -397,9 +397,14 @@
11	397	class cmd_usertestcompare(Command):	397	class cmd_usertestcompare(Command):
12	398	"""Generate a comparison report on csv data produced by userteststats.	398	"""Generate a comparison report on csv data produced by userteststats.
13	399		399
17	400	The CSV files must have names of the form $tool-$suite-$scenario.csv	400	The CSV files must have names of the form $tool-$suite-$scenario.csv:
18	401	(where the components do not contain dashes) and the suite name corresponds	401
19	402	to the usertest suite used to generate the data, e.g. "common" or "log".	402	* $tool is the name of the tool used in the run, like "bzr-1.12". It
20			403	may optionally have a version, separated by a dash.
21			404	* $suite is the usertest suite used to generate the data, e.g. "common"
22			405	or "log"; it must not contain a dash.
23			406	* $scenario is an arbitrary name for the scenario being tested, again
24			407	containing no dashes.
25	403	"""	408	"""
26	404	hidden = True	409	hidden = True
27	405	takes_args = ['csv_files+']	410	takes_args = ['csv_files+']
28	406		411
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	24	import sys	24	import sys
34	25	import time	25	import time
35	26		26
37	27	from bzrlib.trace import info, warning, error	27	from bzrlib.trace import info, warning, error, log_exception_quietly
38	28	import archiveutil	28	import archiveutil
39	29	import datadump	29	import datadump
40	30	import dirutil	30	import dirutil
41	@@ -58,7 +58,7 @@
42	58	try:	58	try:
43	59	module = __import__(module_name, globals(), locals())	59	module = __import__(module_name, globals(), locals())
44	60	except ImportError, e:	60	except ImportError, e:
46	61	# TODO: log exception properly	61	trace.log_exception_quietly()
47	62	info("failed to find module %s\nerror: %s" % (module_name, e))	62	info("failed to find module %s\nerror: %s" % (module_name, e))
48	63	return None	63	return None
49	64	else:	64	else:
50	@@ -66,7 +66,7 @@
51	66	module = getattr(module, part)	66	module = getattr(module, part)
52	67	fn = getattr(module, 'script_suite', None)	67	fn = getattr(module, 'script_suite', None)
53	68	if fn is None:	68	if fn is None:
55	69	# TODO: log exception properly	69	trace.log_exception_quietly()
56	70	info("failed to find script_suite() in %s" % module)	70	info("failed to find script_suite() in %s" % module)
57	71	return None	71	return None
58	72	return fn()	72	return fn()