Merge lp:~pwlars/lava-test/dashboard-format-1.2 into lp:lava-test/0.0

[Paul Larson]

Dashboard Format 1.2 for abrek

[Zygmunt Krynicki (zyga)]

Looks good, thanks for doing this!

review: Approve

=== modified file 'abrek/hwprofile.py'
--- abrek/hwprofile.py	2011-03-23 19:28:04 +0000
+++ abrek/hwprofile.py	2011-04-07 05:29:14 +0000
@@ -197,16 +197,16 @@
             devices.append(device)
     return devices
 
-def get_hw_context():
+def get_hardware_context():
     """
     Return a dict with all of the hardware profile information gathered
     """
-    hw_context = {}
+    hardware_context = {}
     devices = []
     devices.extend(get_cpu_devs())
     devices.extend(get_board_devs())
     devices.extend(get_mem_devs())
     devices.extend(get_usb_devs())
-    hw_context['devices'] = devices
-    return hw_context
+    hardware_context['devices'] = devices
+    return hardware_context
 

=== modified file 'abrek/swprofile.py'
--- abrek/swprofile.py	2010-11-19 18:45:35 +0000
+++ abrek/swprofile.py	2011-04-07 05:29:14 +0000
@@ -35,8 +35,8 @@
             packages.append(pkg)
     return packages
 
-def get_sw_context(apt_cache=None, lsb_information=None):
-    """ Return dict used for storing sw_context information
+def get_software_context(apt_cache=None, lsb_information=None):
+    """ Return dict used for storing software_context information
 
     test_id - Unique identifier for this test
     time_check - whether or not a check was performed to see if
@@ -44,22 +44,22 @@
     apt_cache - if not provided, this will be read from the system
     lsb_information - if not provided, this will be read from the system
     """
-    sw_context = {}
-    sw_context['sw_image'] = get_sw_image(lsb_information)
-    sw_context['packages'] = get_packages(apt_cache)
-    return sw_context
+    software_context = {}
+    software_context['image'] = get_image(lsb_information)
+    software_context['packages'] = get_packages(apt_cache)
+    return software_context
 
-def get_sw_image(lsb_information=None):
+def get_image(lsb_information=None):
     """ Get information about the image we are running
 
-    If /etc/buildstamp exists, get the sw_image id from that.  Otherwise
+    If /etc/buildstamp exists, get the image id from that.  Otherwise
     just use the lsb-release description for a rough idea.
     """
     try:
         buildstamp = read_file("/etc/buildstamp")
-        desc = buildstamp.splitlines()[1]
+        name = buildstamp.splitlines()[1]
     except IOError:
         if lsb_information == None:
             lsb_information = lsb_release.get_lsb_information()
-        desc = lsb_information['DESCRIPTION']
-    return {"desc":desc}
+        name = lsb_information['DESCRIPTION']
+    return {"name":name}

=== modified file 'abrek/testdef.py'
--- abrek/testdef.py	2011-04-01 18:43:44 +0000
+++ abrek/testdef.py	2011-04-07 05:29:14 +0000
@@ -96,17 +96,17 @@
         TIMEFORMAT = '%Y-%m-%dT%H:%M:%SZ'
         testdata = {}
         test_runs = [{}]
-        testdata['format'] = "Dashboard Bundle Format 1.0"
+        testdata['format'] = "Dashboard Bundle Format 1.2"
         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_hw_context()
-        test_runs[0]['hw_context'] = hw
-        sw = swprofile.get_sw_context()
-        test_runs[0]['sw_context'] = sw
+        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)
 

=== modified file 'tests/test_dashboard.py'
--- tests/test_dashboard.py	2010-10-12 00:24:57 +0000
+++ tests/test_dashboard.py	2011-04-07 05:29:14 +0000
@@ -79,29 +79,29 @@
             "test_runs": [{
             "analyzer_assigned_date": "2010-10-10T00:00:00Z",
             "analyzer_assigned_uuid": testuuid,
-            "hw_context": {},
-            "sw_context": {},
+            "hardware_context": {},
+            "software_context": {},
             "test_id": "stream",
             "test_results": [{
-                    "measurement": "1111.1111",
+                    "measurement": 1111.1111,
                     "result": "pass",
                     "test_case_id": "Copy",
                     "units": "MB/s"
                 },
                 {
-                    "measurement": "2222.2222",
+                    "measurement": 2222.2222,
                     "result": "pass",
                     "test_case_id": "Scale",
                     "units": "MB/s"
                 },
                 {
-                    "measurement": "3333.3333",
+                    "measurement": 3333.3333,
                     "result": "pass",
                     "test_case_id": "Add",
                     "units": "MB/s"
                 },
                 {
-                    "measurement": "4444.4444",
+                    "measurement": 4444.4444,
                     "result": "pass",
                     "test_case_id": "Triad",
                     "units": "MB/s"
@@ -162,8 +162,8 @@
 {"test_runs": [{
     "analyzer_assigned_date": "2010-10-10T00:00:00Z",
     "analyzer_assigned_uuid": "%s",
-    "hw_context": {},
-    "sw_context": {},
+    "hardware_context": {},
+    "software_context": {},
     "test_id": "stream",
     "time_check_performed": false
     }]

=== modified file 'tests/test_hwprofile.py'
--- tests/test_hwprofile.py	2010-11-19 18:37:53 +0000
+++ tests/test_hwprofile.py	2011-04-07 05:29:14 +0000
@@ -133,7 +133,7 @@
         meminfo = {
             'attributes': {
                 'kind': 'RAM',
-                'capacity': 243937280},
+                'capacity': '243937280'},
             'description': '232MiB of RAM',
             'device_type': 'device.mem'}
         self.assertEqual(meminfo, devs[0])

=== modified file 'tests/test_swprofile.py'
--- tests/test_swprofile.py	2010-11-24 16:34:45 +0000
+++ tests/test_swprofile.py	2011-04-07 05:29:14 +0000
@@ -49,7 +49,7 @@
             cache = self.cache
         if info == None:
             info = self.lsb_information
-        return abrek.swprofile.get_sw_context(apt_cache=cache,
+        return abrek.swprofile.get_software_context(apt_cache=cache,
                 lsb_information=info)
 
     def test_pkg_name(self):
@@ -62,18 +62,18 @@
         for pkg in a['packages']:
             self.assertEqual(self.testpackage.installed.version, pkg['version'])
 
-    def test_sw_image_desc_lsb(self):
+    def test_image_name_lsb(self):
         a = self.make_profile()
         if os.path.exists('/etc/buildstamp'):
             return
-        self.assertEqual(self.lsb_desc, a['sw_image']['desc'])
+        self.assertEqual(self.lsb_desc, a['image']['name'])
 
-    def test_sw_image_desc_buildstamp(self):
+    def test_image_name_buildstamp(self):
         BUILDSTAMP = "linaro-m-headless-20101101-0"
         BUILDSTAMPFILE = "lexbuild6 Mon, 01 Nov 2010 02:11:39 -0400\n%s" % (
                          BUILDSTAMP)
         fake_file('/etc/buildstamp', BUILDSTAMPFILE)
         a = self.make_profile()
         clear_fakes()
-        self.assertEqual(BUILDSTAMP, a['sw_image']['desc'])
+        self.assertEqual(BUILDSTAMP, a['image']['name'])