Merge lp:~pwlars/lava-test/bug652946 into lp:lava-test/0.0

Proposed by Paul Larson
Status: Merged
Merged at revision: 40
Proposed branch: lp:~pwlars/lava-test/bug652946
Merge into: lp:lava-test/0.0
Diff against target: 51 lines (+15/-18)
2 files modified
abrek/builtins.py (+0/-18)
abrek/test_definitions/ltp.py (+15/-0)
To merge this branch: bzr merge lp:~pwlars/lava-test/bug652946
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+37266@code.launchpad.net

Description of the change

Couple of minor fixes, one to remove parse which is no longer needed, and also add ltp header. Unrelated I know, but both very minor/obvious changes

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'abrek/builtins.py'
2--- abrek/builtins.py 2010-09-28 18:53:14 +0000
3+++ abrek/builtins.py 2010-10-01 14:53:02 +0000
4@@ -93,24 +93,6 @@
5 sys.exit(1)
6
7
8-class cmd_parse(abrek.command.AbrekCmd):
9- def run(self):
10- if len(self.args) != 1:
11- print "please specify the name of the result dir"
12- sys.exit(1)
13- config = abrek.config.AbrekConfig()
14- resultsdir = os.path.join(config.resultsdir, self.args[0])
15- testdatafile = os.path.join(resultsdir, "testdata.json")
16- testdata = json.loads(file(testdatafile,'r').read())
17- test = abrek.testdef.testloader(testdata['test_id'])
18- try:
19- test.parse(self.args[0])
20- except Exception as strerror:
21- print "Test parse error: %s" % strerror
22- sys.exit(1)
23- print test.parser.results
24-
25-
26 class cmd_uninstall(abrek.command.AbrekCmd):
27 """
28 Uninstall a test
29
30=== modified file 'abrek/test_definitions/ltp.py'
31--- abrek/test_definitions/ltp.py 2010-09-15 03:45:43 +0000
32+++ abrek/test_definitions/ltp.py 2010-10-01 14:53:02 +0000
33@@ -1,3 +1,18 @@
34+# Copyright (c) 2010 Linaro
35+#
36+# This program is free software: you can redistribute it and/or modify
37+# it under the terms of the GNU General Public License as published by
38+# the Free Software Foundation, either version 3 of the License, or
39+# (at your option) any later version.
40+#
41+# This program is distributed in the hope that it will be useful,
42+# but WITHOUT ANY WARRANTY; without even the implied warranty of
43+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44+# GNU General Public License for more details.
45+#
46+# You should have received a copy of the GNU General Public License
47+# along with this program. If not, see <http://www.gnu.org/licenses/>.
48+
49 import re
50
51 import abrek.testdef

Subscribers

People subscribed via source and target branches