Merge autotest upstream from @5337 ~ @5360
Change-Id: Iad59314186db370f9219c3fb294b851f4e214e2e
Reviewed-on: http://gerrit.chromium.org/gerrit/1045
Reviewed-by: Eric Li <ericli@chromium.org>
Tested-by: Eric Li <ericli@chromium.org>
diff --git a/frontend/afe/resources.py b/frontend/afe/resources.py
index eaeeea0..b783115 100644
--- a/frontend/afe/resources.py
+++ b/frontend/afe/resources.py
@@ -1,10 +1,11 @@
from django import http
-from autotest_lib.frontend.shared import query_lib, resource_lib
+from autotest_lib.frontend.shared import query_lib, resource_lib, exceptions
from autotest_lib.frontend.afe import control_file, models, rpc_utils
from autotest_lib.frontend.afe import model_attributes
from autotest_lib.frontend import thread_local
from autotest_lib.client.common_lib import host_protections
+
class EntryWithInvalid(resource_lib.InstanceEntry):
def put(self):
if self.instance.invalid:
@@ -319,7 +320,7 @@
if 'platform' in input_dict:
label = self.resolve_link(input_dict['platform']) .instance
if not label.platform:
- raise BadRequest('Label %s is not a platform' % label.name)
+ raise exceptions.BadRequest('Label %s is not a platform' % label.name)
for label in self.instance.labels.filter(platform=True):
self.instance.labels.remove(label)
self.instance.labels.add(label)
@@ -779,7 +780,7 @@
def update(self, input_dict):
if 'aborted' in input_dict:
if input_dict['aborted'] != True:
- raise BadRequest('"aborted" can only be set to true')
+ raise exceptions.BadRequest('"aborted" can only be set to true')
query = models.HostQueueEntry.objects.filter(pk=self.instance.pk)
models.AclGroup.check_abort_permissions(query)
rpc_utils.check_abort_synchronous_jobs(query)