Merge lp:~joetalbott/qa-dashboard/add_variant into lp:qa-dashboard

[Joe Talbott]

Add 'variant' as a column for CSV data imports.

Add 'variant' as a column for CSV data imports.

[Chris Johnston (cjohnston)]

review: Approve

[Chris Johnston (cjohnston)]

The attempt to merge lp:~joetalbott/qa-dashboard/add_variant into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Type 'yes' if you would like to try deleting the test database 'test_qa_dashboard', or 'no' to cancel:
Got an error creating the test database: database "test_qa_dashboard" already exists

Traceback (most recent call last):
  File "manage.py", line 26, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 429, in execute_from_command_line
    utility.execute()
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/test.py", line 8, in handle
    super(Command, self).handle(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 296, in setup_databases
    test_db_name = connection.creation.create_test_db(self.verbosity, autoclobber=not self.interactive)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/creation.py", line 351, in create_test_db
    self._create_test_db(verbosity, autoclobber)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/creation.py", line 431, in _create_test_db
    confirm = raw_input("Type 'yes' if you would like to try deleting the test database '%s', or 'no' to cancel: " % test_database_name)
EOFError: EOF when reading a line

=== modified file 'bootspeed/models.py'
--- bootspeed/models.py	2012-12-13 02:32:26 +0000
+++ bootspeed/models.py	2012-12-17 22:24:21 +0000
@@ -170,6 +170,7 @@
                 result.plumbing,
                 result.xorg,
                 result.desktop,
+                result.desktop + result.xorg,
                 result.boot,
             ]
             result_nums.append(result_data)
@@ -187,28 +188,32 @@
         plumbing_std = std_ar[2]
         xorg_std = std_ar[3]
         desktop_std = std_ar[4]
-        boot_std = std_ar[5]
+        xorg_desktop_std = std_ar[5]
+        boot_std = std_ar[6]
 
         kernel_avg = avg_ar[0]
         kernel_init_avg = avg_ar[1]
         plumbing_avg = avg_ar[2]
         xorg_avg = avg_ar[3]
         desktop_avg = avg_ar[4]
-        boot_avg = avg_ar[5]
+        xorg_desktop_avg = avg_ar[5]
+        boot_avg = avg_ar[6]
 
         kernel_min = min_ar[0]
         kernel_init_min = min_ar[1]
         plumbing_min = min_ar[2]
         xorg_min = min_ar[3]
         desktop_min = min_ar[4]
-        boot_min = min_ar[5]
+        xorg_desktop_min = min_ar[5]
+        boot_min = min_ar[6]
 
         kernel_max = max_ar[0]
         kernel_init_max = max_ar[1]
         plumbing_max = max_ar[2]
         xorg_max = max_ar[3]
         desktop_max = max_ar[4]
-        boot_max = max_ar[5]
+        xorg_desktop_max = max_ar[5]
+        boot_max = max_ar[6]
 
 
         agg_data, created = ImageMachineAgg.objects.get_or_create(
@@ -244,6 +249,11 @@
                 desktop_max=desktop_max,
                 desktop_min=desktop_min,
 
+                xorg_desktop_std=xorg_desktop_std,
+                xorg_desktop_avg=xorg_desktop_avg,
+                xorg_desktop_max=xorg_desktop_max,
+                xorg_desktop_min=xorg_desktop_min,
+
                 boot_std=boot_std,
                 boot_avg=boot_avg,
                 boot_max=boot_max,
@@ -288,6 +298,11 @@
     desktop_avg = models.FloatField(default=0)
     desktop_std = models.FloatField(default=0)
 
+    xorg_desktop_min = models.FloatField(default=0)
+    xorg_desktop_max = models.FloatField(default=0)
+    xorg_desktop_avg = models.FloatField(default=0)
+    xorg_desktop_std = models.FloatField(default=0)
+
     boot_min = models.FloatField(default=0)
     boot_max = models.FloatField(default=0)
     boot_avg = models.FloatField(default=0)
@@ -315,6 +330,10 @@
             desktop_min,
             desktop_max,
             desktop_std,
+            xorg_desktop_avg,
+            xorg_desktop_min,
+            xorg_desktop_max,
+            xorg_desktop_std,
             boot_avg,
             boot_min,
             boot_max,
@@ -343,6 +362,10 @@
         self.desktop_min = desktop_min
         self.desktop_max = desktop_max
         self.desktop_std = desktop_std
+        self.xorg_desktop_avg = xorg_desktop_avg
+        self.xorg_desktop_min = xorg_desktop_min
+        self.xorg_desktop_max = xorg_desktop_max
+        self.xorg_desktop_std = xorg_desktop_std
         self.boot_avg = boot_avg
         self.boot_min = boot_min
         self.boot_max = boot_max

=== modified file 'bootspeed/utils.py'
--- bootspeed/utils.py	2012-12-11 02:36:52 +0000
+++ bootspeed/utils.py	2012-12-17 22:24:21 +0000
@@ -36,11 +36,11 @@
             'image_build_number',
             'image_arch',
             'image_md5',
+            'image_release',
+            'image_variant',
             'ran_at',
     ]
 
-    logging.debug("fields: {}".format(fields))
-
     for field in fields:
         if field not in data:
             raise MissingField(
@@ -62,6 +62,8 @@
     image, new_image = Image.objects.get_or_create(
             build_number=data['image_build_number'],
             arch=data['image_arch'],
+            release=data['image_release'],
+            variant=data['image_variant'],
             md5=data['image_md5'],
     )
 

=== modified file 'scripts/add_bootspeed_result.py'
--- scripts/add_bootspeed_result.py	2012-12-11 21:03:37 +0000
+++ scripts/add_bootspeed_result.py	2012-12-17 22:24:21 +0000
@@ -25,11 +25,12 @@
                     'desktop': row[4],
                     'boot': row[5],
                     'image_release': row[6],
-                    'image_arch': row[7],
-                    'ran_at': row[8][:19],
-                    'image_build_number': row[9],
-                    'image_md5': row[10],
-                    'machine_name': row[11],
-                    'machine_mac': row[12],
+                    'image_variant': row[7],
+                    'image_arch': row[8],
+                    'ran_at': row[9],
+                    'image_build_number': row[10],
+                    'image_md5': row[11],
+                    'machine_name': row[12],
+                    'machine_mac': row[13],
             }
             add_bootspeed_result(data)