Merge lp:~le-chi-thu/lava-test/merging_w1121 into lp:lava-test/0.0

[Le Chi Thu]

Merged the following branches:
https://code.launchpad.net/~zkrynicki/abrek/limbs/+merge/58350
https://code.launchpad.net/~zkrynicki/abrek/use-document-io
https://code.launchpad.net/~zkrynicki/abrek/better-generate-bundle
https://code.launchpad.net/~zkrynicki/abrek/optional-linaro-dashboard-bundle
https://code.launchpad.net/~zkrynicki/abrek/cleanup-savedata

[Paul Larson (pwlars)]

This seems to work, but somehow you seem to have picked up the changes from https://code.launchpad.net/~zkrynicki/abrek/save-tests-as-uuid/+merge/58356 which I asked that we *not* pick up for now.

It also might have been easier to spot this if you had done a commit for each merge. You only have 3 commits here, but there were several branches going into this.

review: Needs Fixing

[lp:~le-chi-thu/lava-test/merging_w1121]

73. By Le Chi Thu <email address hidden> <email address hidden> on 2011-06-07

Undo the UUID changes

[Le Chi Thu (le-chi-thu)]

Hi

I did not merge the
https://code.launchpad.net/~zkrynicki/abrek/save-tests-as-uuid/+merge/58356
and I
found the uuid is included in
https://code.launchpad.net/~zkrynicki/abrek/use-document-io

Now I manually removed the uuid changes in 58356 and push the changes to
this mp.

BR

/Chi Thu

On 7 June 2011 18:39, Paul Larson <email address hidden> wrote:

> Review: Needs Fixing
> This seems to work, but somehow you seem to have picked up the changes from
> https://code.launchpad.net/~zkrynicki/abrek/save-tests-as-uuid/+merge/58356which I asked that we *not* pick up for now.
>
> It also might have been easier to spot this if you had done a commit for
> each merge. You only have 3 commits here, but there were several branches
> going into this.
> --
> https://code.launchpad.net/~le-chi-thu/abrek/merging_w1121/+merge/63709
> You are the owner of lp:~le-chi-thu/abrek/merging_w1121.
>

[Paul Larson (pwlars)]

Thanks!

review: Approve

=== added file 'abrek/api.py'
--- abrek/api.py	1970-01-01 00:00:00 +0000
+++ abrek/api.py	2011-06-07 21:21:22 +0000
@@ -0,0 +1,44 @@
+"""
+Public API for extending Abrek
+"""
+from abc import abstractmethod, abstractproperty
+
+
+class ITest(object):
+    """
+    Abrek test.
+
+    Something that can be installed and invoked by abre.
+    """
+
+    @abstractmethod
+    def install(self):
+        """
+        Install the test suite.
+
+        This creates an install directory under the user's XDG_DATA_HOME
+        directory to mark that the test is installed.  The installer's
+        install() method is then called from this directory to complete any
+        test specific install that may be needed.
+        """
+
+    @abstractmethod
+    def uninstall(self):
+        """
+        Uninstall the test suite.
+
+        Uninstalling just recursively removes the test specific directory under
+        the user's XDG_DATA_HOME directory.  This will both mark the test as
+        removed, and clean up any files that were downloaded or installed under
+        that directory.  Dependencies are intentionally not removed by this.
+        """
+
+    @abstractmethod
+    def run(self, quiet=False):
+        # TODO: Document me
+        pass
+    
+    @abstractmethod
+    def parse(self, resultname):
+        # TODO: Document me
+        pass

=== added file 'abrek/bundle.py'
--- abrek/bundle.py	1970-01-01 00:00:00 +0000
+++ abrek/bundle.py	2011-06-07 21:21:22 +0000
@@ -0,0 +1,44 @@
+# Copyright (c) 2011 Linaro
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+This module attempts to use the linaro-dashboard-bundle package, if possible.
+
+Using that package adds proper support for loading and saving bundle
+documents.  In particular it supports loosles decimals, better, more stable
+load-modify-write cycles, data validation, transparent migration and many
+other features.
+
+It is not a hard dependency to make it possible to run abrek from a checkout
+without having to install (too many) dependencies.
+"""
+
+try:
+    from linaro_dashboard_bundle import DocumentIO
+except ImportError:
+    import json
+
+    class DocumentIO(object):
+        """ Bare replacement DocumentIO without any fancy features """
+
+        @classmethod
+        def dumps(cls, doc):
+            return json.dumps(doc, indent=2)
+
+        @classmethod
+        def loads(cls, text):
+            doc = json.loads(text)
+            fmt = doc.get("format")
+            return fmt, doc
\ No newline at end of file

=== modified file 'abrek/dashboard.py'
--- abrek/dashboard.py	2010-10-14 13:57:35 +0000
+++ abrek/dashboard.py	2011-06-07 21:21:22 +0000
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import base64
-import json
 import os
 import socket
 import sys
@@ -24,6 +23,7 @@
 from getpass import getpass
 from optparse import make_option
 
+from abrek.bundle import DocumentIO
 from abrek.command import AbrekCmd, AbrekCmdWithSubcommands
 from abrek.config import get_config
 from abrek.testdef import testloader
@@ -147,7 +147,7 @@
                     "dashboard setup [host]'"
                 sys.exit(1)
             try:
-                result = server.put(json.dumps(bundle, indent=2), result_name,
+                result = server.put(DocumentIO.dumps(bundle), result_name,
                     stream_name)
                 print "Bundle successfully uploaded to id: %s" % result
             except xmlrpclib.Fault as strerror:
@@ -173,7 +173,7 @@
                 sys.exit(1)
             bundle = generate_bundle(self.args[0])
             try:
-                print json.dumps(bundle, indent=2)
+                print DocumentIO.dumps(bundle)
             except IOError:
                 pass
 
@@ -182,17 +182,24 @@
     config = get_config()
     resultdir = os.path.join(config.resultsdir, result)
     if not os.path.exists(resultdir):
+        # FIXME: UI and sys.exit mixed with internal implementation, yuck
         print "Result directory not found"
         sys.exit(1)
-    testdatafile = os.path.join(resultdir, "testdata.json")
-    testdata = json.loads(file(testdatafile).read())
-    test = testloader(testdata['test_runs'][0]['test_id'])
-    try:
-        test.parse(result)
-    except Exception as strerror:
-        print "Test parse error: %s" % strerror
-        sys.exit(1)
-    testdata['test_runs'][0].update(test.parser.results)
-    return testdata
+    with open(os.path.join(resultdir, "testdata.json")) as stream:
+        bundle_text = stream.read()
+    with open(os.path.join(resultdir, "testoutput.log")) as stream:
+        output_text = stream.read()
+    fmt, bundle = DocumentIO.loads(bundle_text)
+    test = testloader(bundle['test_runs'][0]['test_id'])
+    test.parse(result)
+    bundle['test_runs'][0]["test_results"] = test.parser.results["test_results"]
+    bundle['test_runs'][0]["attachments"] = [
+        {
+            "pathname": "testoutput.log",
+            "mime_type": "text/plain",
+            "content":  base64.standard_b64encode(output_text)
+        }
+    ]
+    return bundle 
 
 

=== modified file 'abrek/main.py'
--- abrek/main.py	2010-10-11 23:05:37 +0000
+++ abrek/main.py	2011-06-07 21:21:22 +0000
@@ -26,3 +26,9 @@
         print "command '%s' not found" % cmd
         return 1
     return cmd_func.main(argv)
+
+if __name__ == '__main__':
+    import os
+    import sys
+    exit_code = main(sys.argv)
+    sys.exit(exit_code)
\ No newline at end of file

=== modified file 'abrek/testdef.py'
--- abrek/testdef.py	2011-04-20 08:39:25 +0000
+++ abrek/testdef.py	2011-06-07 21:21:22 +0000
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import hashlib
-import json
 import os
 import re
 import shutil
@@ -22,15 +21,15 @@
 import time
 from commands import getstatusoutput
 from datetime import datetime
-from uuid import uuid1
 
+from abrek import swprofile, hwprofile
+from abrek.api import ITest
+from abrek.bundle import DocumentIO
 from abrek.config import get_config
 from abrek.utils import Tee, geturl, run_and_log, write_file
-from abrek import hwprofile
-from abrek import swprofile
-
-
-class AbrekTest(object):
+
+
+class AbrekTest(ITest):
     """Base class for defining tests.
 
     This can be used by test definition files to create an object that
@@ -94,21 +93,21 @@
 
     def _savetestdata(self):
         TIMEFORMAT = '%Y-%m-%dT%H:%M:%SZ'
-        testdata = {}
-        test_runs = [{}]
-        testdata['format'] = "Dashboard Bundle Format 1.2"
+        bundle = {
+            'format': 'Dashboard Bundle Format 1.2',
+            'test_runs': [
+                {
+                    'test_id': self.testname,
+                    'analyzer_assigned_date': self.runner.starttime.strftime(TIMEFORMAT),
+                    'time_check_performed': False,
+                    'hardware_context': hwprofile.get_hardware_context(),
+                    'software_context': swprofile.get_software_context(),
+                    'test_results': []
+                }
+            ]
+        }
         filename = os.path.join(self.resultsdir, 'testdata.json')
-        test_runs[0]['test_id'] = self.testname
-        test_runs[0]['analyzer_assigned_uuid'] = str(uuid1())
-        test_runs[0]['time_check_performed'] = False
-        test_runs[0]['analyzer_assigned_date'] = datetime.strftime(
-                                             self.runner.starttime,TIMEFORMAT)
-        hw = hwprofile.get_hardware_context()
-        test_runs[0]['hardware_context'] = hw
-        sw = swprofile.get_software_context()
-        test_runs[0]['software_context'] = sw
-        testdata['test_runs'] = test_runs
-        write_file(json.dumps(testdata, indent=2), filename)
+        write_file(DocumentIO.dumps(bundle), filename)
 
     def run(self, quiet=False):
         if not self.runner:
@@ -120,10 +119,12 @@
                      str(time.mktime(datetime.utcnow().timetuple())))
         self.resultsdir = os.path.join(config.resultsdir, resultname)
         os.makedirs(self.resultsdir)
-        os.chdir(installdir)
-        self.runner.run(self.resultsdir, quiet=quiet)
-        self._savetestdata()
-        os.chdir(self.origdir)
+        try:
+            os.chdir(installdir)
+            self.runner.run(self.resultsdir, quiet=quiet)
+            self._savetestdata()
+        finally:
+            os.chdir(self.origdir)
         result_id = os.path.basename(self.resultsdir)
         print("ABREK TEST RUN COMPLETE: Result id is '%s'" % result_id)
         return result_id
@@ -278,12 +279,14 @@
         except Exception as strerror:
             raise RuntimeError("AbrekTestParser - Invalid regular expression '%s' - %s" %(self.pattern,strerror))
 
-        with open(filename, 'r') as fd:
-            for line in fd.readlines():
+        with open(filename, 'r') as stream:
+            for lineno, line in enumerate(stream, 1):
                 match = pat.search(line)
                 if not match:
                     continue
                 data = match.groupdict()
+                data["log_filename"] = filename
+                data["log_lineno"] = lineno
                 self.results['test_results'].append(data)
         if self.fixupdict:
             self.fixresults(self.fixupdict)

=== modified file 'tests/test_dashboard.py'
--- tests/test_dashboard.py	2011-04-07 05:26:43 +0000
+++ tests/test_dashboard.py	2011-06-07 21:21:22 +0000
@@ -76,37 +76,54 @@
         cmd = cmd_dashboard.cmd_bundle()
         (testname, testuuid) = make_stream_result(self.config)
         expected_dict = {
+            "format": "Dashboard Bundle Format 1.2",
             "test_runs": [{
             "analyzer_assigned_date": "2010-10-10T00:00:00Z",
             "analyzer_assigned_uuid": testuuid,
-            "hardware_context": {},
+            "hardware_context": {
+                "devices": []
+            },
             "software_context": {},
             "test_id": "stream",
             "test_results": [{
                     "measurement": 1111.1111,
                     "result": "pass",
                     "test_case_id": "Copy",
-                    "units": "MB/s"
+                    "units": "MB/s",
+                    "log_filename": "testoutput.log",
+                    "log_lineno": 3
                 },
                 {
                     "measurement": 2222.2222,
                     "result": "pass",
                     "test_case_id": "Scale",
-                    "units": "MB/s"
+                    "units": "MB/s",
+                    "log_filename": "testoutput.log",
+                    "log_lineno": 4
                 },
                 {
                     "measurement": 3333.3333,
                     "result": "pass",
                     "test_case_id": "Add",
-                    "units": "MB/s"
+                    "units": "MB/s",
+                    "log_filename": "testoutput.log",
+                    "log_lineno": 5
                 },
                 {
                     "measurement": 4444.4444,
                     "result": "pass",
                     "test_case_id": "Triad",
-                    "units": "MB/s"
+                    "units": "MB/s",
+                    "log_filename": "testoutput.log",
+                    "log_lineno": 6
                 }],
-            "time_check_performed": False
+            "time_check_performed": False,
+            "attachments": [
+                {
+                "mime_type": "text/plain",
+                "pathname": "testoutput.log",
+                "content": "CkZ1bmN0aW9uICAgICAgUmF0ZSAoTUIvcykgICBBdmcgdGltZSAgICAgTWluIHRpbWUgICAgIE1heCB0aW1lCkNvcHk6ICAgICAgICAxMTExLjExMTEgICAgICAgMC4wMTgwICAgICAgIDAuMDExMiAgICAgICAwLjAyNDIKU2NhbGU6ICAgICAgIDIyMjIuMjIyMiAgICAgICAwLjAxOTggICAgICAgMC4wMTIyICAgICAgIDAuMDI0MwpBZGQ6ICAgICAgICAgMzMzMy4zMzMzICAgICAgIDAuMDIwMSAgICAgICAwLjAxNzYgICAgICAgMC4wMjIzClRyaWFkOiAgICAgICA0NDQ0LjQ0NDQgICAgICAgMC4wMTk3ICAgICAgIDAuMDEzOCAgICAgICAwLjAyMjMK"
+                }]
              }]
         }
         cmd.main(argv=[testname])
@@ -159,13 +176,18 @@
     testname = "stream000"
     testuuid = str(uuid1())
     testdata_data = """
-{"test_runs": [{
+{
+"format": "Dashboard Bundle Format 1.2",
+"test_runs": [{
     "analyzer_assigned_date": "2010-10-10T00:00:00Z",
     "analyzer_assigned_uuid": "%s",
-    "hardware_context": {},
+    "hardware_context": {
+        "devices": []
+    },
     "software_context": {},
     "test_id": "stream",
-    "time_check_performed": false
+    "time_check_performed": false,
+    "test_results": []
     }]
 }
 """ % testuuid