aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/rebaseline_server
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-05 21:00:24 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-05 21:00:24 +0000
commit1e698afbc22507438783d36a56428f0b7e715393 (patch)
tree623b1494a09baf692d035f36cb25fa9e26034f60 /gm/rebaseline_server
parent56ad44b53a7ea032d1c42ac559316dc9c8346389 (diff)
rebaseline_server was not allowing tests to be marked ignore-failure
(SkipBuildbotRuns) TBR=jcgregorio Review URL: https://codereview.chromium.org/59063005 git-svn-id: http://skia.googlecode.com/svn/trunk@12143 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/rebaseline_server')
-rw-r--r--gm/rebaseline_server/static/loader.js4
-rw-r--r--gm/rebaseline_server/static/view.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js
index 04b023651a..ab5ab480d2 100644
--- a/gm/rebaseline_server/static/loader.js
+++ b/gm/rebaseline_server/static/loader.js
@@ -64,7 +64,7 @@ Loader.controller(
$scope.showSubmitAdvancedSettings = false;
$scope.submitAdvancedSettings = {};
$scope.submitAdvancedSettings['reviewed-by-human'] = true;
- $scope.submitAdvancedSettings['ignore-failures'] = false;
+ $scope.submitAdvancedSettings['ignore-failure'] = false;
$scope.submitAdvancedSettings['bug'] = '';
// Create the list of tabs (lists into which the user can file each
@@ -368,7 +368,7 @@ Loader.controller(
$scope.submitAdvancedSettings['reviewed-by-human'];
if (true == $scope.submitAdvancedSettings['ignore-failure']) {
// if it's false, don't send it at all (just keep the default)
- expectedResult['ignoreFailure'] = true;
+ expectedResult['ignore-failure'] = true;
}
expectedResult['bugs'] = bugs;
diff --git a/gm/rebaseline_server/static/view.html b/gm/rebaseline_server/static/view.html
index 643b1fdf6a..1a5faf50c1 100644
--- a/gm/rebaseline_server/static/view.html
+++ b/gm/rebaseline_server/static/view.html
@@ -160,7 +160,7 @@
<input type="checkbox" ng-model="showSubmitAdvancedSettings">
show
<ul ng-hide="!showSubmitAdvancedSettings">
- <li ng-repeat="setting in ['reviewed-by-human', 'ignore-failures']">
+ <li ng-repeat="setting in ['reviewed-by-human', 'ignore-failure']">
{{setting}}
<input type="checkbox" ng-model="submitAdvancedSettings[setting]">
</li>