Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: frontend/afe/models.py

Issue 6181003: Add support for an --image flag to atest. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: Fixing missing 'self.' in commented out parameters. Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « frontend/afe/model_logic.py ('k') | frontend/afe/rpc_interface.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frontend/afe/models.py
diff --git a/frontend/afe/models.py b/frontend/afe/models.py
index 33ffb8ca785e979c3e170b157ded4e8be33a1610..8cf42fa933a89f4dc924d44121556c9f8858182f 100644
--- a/frontend/afe/models.py
+++ b/frontend/afe/models.py
@@ -993,9 +993,15 @@ class Job(dbmodels.Model, model_logic.ModelExtensions):
control_file = options.get('control_file')
parameterized_job = options.get('parameterized_job')
- cls.check_parameterized_job(control_file=control_file,
- parameterized_job=parameterized_job)
+ # The current implementation of parameterized jobs requires that only
+ # control files or parameterized jobs are used. Using the image
+ # parameter on autoupdate_ParameterizedJob doesn't mix pure
+ # parameterized jobs and control files jobs, it does muck enough with
+ # normal jobs by adding a parameterized id to them that this check will
+ # fail. So for now we just skip this check.
+ # cls.check_parameterized_job(control_file=control_file,
+ # parameterized_job=parameterized_job)
user = User.current_user()
if options.get('reboot_before') is None:
options['reboot_before'] = user.get_reboot_before_display()
@@ -1032,8 +1038,14 @@ class Job(dbmodels.Model, model_logic.ModelExtensions):
def save(self, *args, **kwargs):
- self.check_parameterized_job(control_file=self.control_file,
- parameterized_job=self.parameterized_job)
+ # The current implementation of parameterized jobs requires that only
+ # control files or parameterized jobs are used. Using the image
+ # parameter on autoupdate_ParameterizedJob doesn't mix pure
+ # parameterized jobs and control files jobs, it does muck enough with
+ # normal jobs by adding a parameterized id to them that this check will
+ # fail. So for now we just skip this check.
+ # cls.check_parameterized_job(control_file=self.control_file,
+ # parameterized_job=self.parameterized_job)
super(Job, self).save(*args, **kwargs)
« no previous file with comments | « frontend/afe/model_logic.py ('k') | frontend/afe/rpc_interface.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698