From 71e2e80d926a53de494bde83c8f393757d099c0c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 29 May 2018 09:09:31 -0400 Subject: [PATCH] Give the waive dialog more context. This should fix the UI in a couple places: - fixes #2363 - fixes #2270 There, it claims that only one failing result is waived, but a read through the method in `models.py` suggests that *all* unsatisfied requirements are currently waived. Signed-off-by: Ralph Bean --- bodhi/server/services/updates.py | 2 +- bodhi/server/templates/update.html | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bodhi/server/services/updates.py b/bodhi/server/services/updates.py index 8f3a6045dd..49b848187c 100644 --- a/bodhi/server/services/updates.py +++ b/bodhi/server/services/updates.py @@ -561,7 +561,7 @@ def new_update(request): error_handler=bodhi.server.services.errors.json_handler) def waive_test_results(request): """ - Waive test results on a given update when gating is on. + Waive all blocking test results on a given update when gating is on. Args: request (pyramid.request): The current request. diff --git a/bodhi/server/templates/update.html b/bodhi/server/templates/update.html index fe05935241..a93b333fc4 100644 --- a/bodhi/server/templates/update.html +++ b/bodhi/server/templates/update.html @@ -66,6 +66,7 @@ if ($.inArray(requirement.testcase, requirements) == -1) { requirements.push(requirement.testcase); } + $('#failed_requirements').append('
  • ' + req.item + '
    • '); }); % if request.registry.settings.get("test_gating.required") is True: if (data['policies_satisfied']) { @@ -1104,17 +1105,26 @@

    Test Cases

    - +
    -
    - +
    +
    +

    Submitting this will waive the following test results blocking this update:

    +
      +
      +
      +
      + +
      + +
      - +