Merge lp:~cjohnston/qa-dashboard/fix-ci-dashboard-update into lp:qa-dashboard

[Chris Johnston]

Fix flake8 issues, remove duplicate calls for updating power

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:677
http://10.97.0.26:8080/job/dashboard-ci/253/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/253/rebuild

review: Approve (continuous-integration)

[lp:~cjohnston/qa-dashboard/fix-ci-dashboard-update]

677. By Chris Johnston on 2013-11-08

Fix flake8 issues and remove duplicate call to update power

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'scripts/ci-dashboard-update.py'
--- scripts/ci-dashboard-update.py	2013-11-05 22:44:55 +0000
+++ scripts/ci-dashboard-update.py	2013-11-08 19:01:10 +0000
@@ -16,11 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-import datetime
 import logging
 import os
 import sys
-import time
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'qa_dashboard.settings'
@@ -40,18 +38,19 @@
 slow_lock_file = '/var/lock/update-slow-{}.lock'.format(project)
 logger = logging.getLogger("update_pull")
 
+
 @lockfile_dec(slow_lock_file)
 @txstatsd_interval('update_slow', append_days=True)
 def update_slow(days):
 
-	update_sru(days=days)
-	update_bootspeed(days=days)
-	update_power(days=days)
-	update_memory(days=days)
+    update_sru(days=days)
+    update_bootspeed(days=days)
+    update_power(days=days)
+    update_memory(days=days)
     #update_idlepower(days=days)
-	update_eventstat(days=days)
-	update_power(days=days)
-	update_plugin_data(days=days)
+    update_eventstat(days=days)
+    update_plugin_data(days=days)
+
 
 @lockfile_dec(fast_lock_file)
 @txstatsd_interval('update_fast', append_days=True)
@@ -60,41 +59,46 @@
     update_smokeng(days=days)
     update_lp_bugs()
 
+
 @txstatsd_interval('jenkins_pull_smokeng', append_days=True)
 def update_smokeng(days=DEFAULT_DAYS):
     call_command('jenkins_pull_smokeng', days=days)
 
+
 @txstatsd_interval('launchpad_pull_bugs')
 def update_lp_bugs():
     call_command('launchpad_pull_bugs')
 
+
 @txstatsd_interval('jenkins_pull_sru', append_days=True)
 def update_sru(days=DEFAULT_DAYS):
     call_command('jenkins_pull_sru', days=DEFAULT_DAYS)
 
+
 @txstatsd_interval('jenkins_pull_bootspeed', append_days=True)
 def update_bootspeed(days=DEFAULT_DAYS):
     call_command('jenkins_pull_bootspeed', days=DEFAULT_DAYS)
 
+
 @txstatsd_interval('jenkins_pull_power', append_days=True)
 def update_power(days=DEFAULT_DAYS):
     call_command('jenkins_pull_power', days=DEFAULT_DAYS)
 
+
 @txstatsd_interval('jenkins_pull_idlepower', append_days=True)
 def update_idlepower(days=DEFAULT_DAYS):
     call_command('jenkins_pull_idlepower', days=DEFAULT_DAYS)
 
+
 @txstatsd_interval('jenkins_pull_memory', append_days=True)
 def update_memory(days=DEFAULT_DAYS):
     call_command('jenkins_pull_memory', days=DEFAULT_DAYS)
 
+
 @txstatsd_interval('jenkins_pull_eventstat', append_days=True)
 def update_eventstat(days=DEFAULT_DAYS):
     call_command('jenkins_pull_eventstat', days=DEFAULT_DAYS)
 
-@txstatsd_interval('jenkins_pull_power', append_days=True)
-def update_power(days=DEFAULT_DAYS):
-    call_command('jenkins_pull_power', days=DEFAULT_DAYS)
 
 @txstatsd_interval('pull_plugin_data')
 def update_plugin_data(days=DEFAULT_DAYS):