Apply pep8 to loadtests

loadtests/facade.py

@@ -1,6 +1,5 @@
-from .testmodels import *
+from .testmodels import TestRun
 
-import pdb
 
 def addTestResult(testId, inputShape, subvolumeShape, pointAsTuple, durationInSec, duration_copy_in_sec, dtype):
     test = TestRun.objects(id=testId).first()

loadtests/testmodels.py

@@ -1,5 +1,5 @@
 from mongoengine import Document, EmbeddedDocument
-from mongoengine.fields import *
+from mongoengine.fields import IntField, ListField, EmbeddedDocumentField, FloatField, StringField, DateTimeField
 
 from volumes.models import Volume
 
@@ -9,6 +9,7 @@ class Dim(EmbeddedDocument):
     y = IntField()
     z = IntField()
 
+
 class Result(EmbeddedDocument):
     originalSize = EmbeddedDocumentField(Dim)
     subvolumeSize = EmbeddedDocumentField(Dim)
@@ -33,7 +34,7 @@ class TestRun(Document):
     results = ListField(EmbeddedDocumentField(Result))
     created = DateTimeField()
 
-    meta = { "db_alias": "test_results" }
+    meta = {"db_alias": "test_results"}
 
     def addTestResult(self, originalShape, subvolumeShape, subvolumePoint, durationInSec, duration_copy_in_sec, dtype):
         result = Result()
@@ -56,13 +57,12 @@ class TestRun(Document):
 
         TestRun.objects(id=self.id).update_one(push__results=result)
 
-
     @property
     def volume_name(self):
         volumes = Volume.objects(id=self.volumeId)
 
         if volumes is None:
-            return volumeId
+            return self.volumeId
         else:
             return volumes.first().name
 
@@ -86,6 +86,4 @@ class TestRun(Document):
         for result in self.results:
             average += result.get_copy_throughput
 
-
         return average / len(self.results)
-

loadtests/urls.py

@@ -1,10 +1,11 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
 
 from . import views
 
 # loadtest url file
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'^$', views.index, name='home'),
     url(r'^init/(?P<volumeId>[\da-z]+)/(?P<testName>[\da-z+*_/%]+)/$', views.testsetup),
     url(r'^delete/(?P<id>[\da-z]+)/$', views.deletetest, name='delete'),

loadtests/views.py

@@ -1,21 +1,24 @@
 import csv
 
-from django.template import RequestContext
+from django.contrib import messages
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render
-from django.core.urlresolvers import reverse
-from .testmodels import *
 
+from .testmodels import TestRun
+
+from mongoengine import ValidationError
 
 from datetime import datetime
 import logging
 
 logger = logging.getLogger(__name__)
 
-# loadtest views
+
 def index(request):
     tests = TestRun.objects().order_by('-created')
-    return render(request, 'loadtests/index.html', {'tests': tests })
+    return render(request, 'loadtests/index.html', {'tests': tests})
+
 
 def testsetup(request, volumeId, testName):
     test = TestRun()
@@ -27,6 +30,7 @@ def testsetup(request, volumeId, testName):
 
     return response
 
+
 def deletetest(request, id):
     try:
         test = TestRun.objects(id=id).first()
@@ -36,6 +40,7 @@ def deletetest(request, id):
     test.delete()
     return HttpResponseRedirect(reverse('loadtests:home'))
 
+
 def createcsv(request, id):
     test = TestRun.objects(id=id).first()
 
@@ -52,10 +57,10 @@ def createcsv(request, id):
     return response
 
 
+def handleException(request, id, e):
+    if type(e) is ValidationError:
+        messages.error(request, '%s not a valid ObjectId' % id)
+    elif type(e) is IndexError:
+        messages.error(request, 'object for %s not found in db' % id)
 
-
-
-
-
-
-
+    return HttpResponseRedirect(reverse('loadtests:home'))