From 8f902a54f3693b9ed3a71317fc55f22e8d92fe2d Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Tue, 12 Dec 2017 13:26:33 +0000 Subject: [PATCH] Merge pull request #1326 from AllenBW/bug/master/#1516430-incorrect-elapsed-play-calculation BZ#1516430-Ensure the correct ansible play elapsed time is displayed (cherry picked from commit 22f27c12e3be47e2202d476963f41a0b19a44aa7) https://bugzilla.redhat.com/show_bug.cgi?id=1525079 --- .../app/services/resource-details/resource-details.component.js | 2 +- .../service-details/service-details-ansible.component.js | 2 +- .../service-details/service-details-ansible.component.spec.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/app/services/resource-details/resource-details.component.js b/client/app/services/resource-details/resource-details.component.js index 61ffe6ebd..d22ec757e 100644 --- a/client/app/services/resource-details/resource-details.component.js +++ b/client/app/services/resource-details/resource-details.component.js @@ -445,7 +445,7 @@ function ComponentController ($state, $stateParams, VmsService, lodash, EventNot } function elapsed (finish, start) { - return Math.abs(new Date(finish) - new Date(start)) / 100 + return Math.abs(new Date(finish) - new Date(start)) / 1000 } function availableTooltip (item) { diff --git a/client/app/services/service-details/service-details-ansible.component.js b/client/app/services/service-details/service-details-ansible.component.js index 16f4bf687..a23a8eff1 100644 --- a/client/app/services/service-details/service-details-ansible.component.js +++ b/client/app/services/service-details/service-details-ansible.component.js @@ -104,6 +104,6 @@ function ComponentController (ModalService, ServicesState, lodash) { } function elapsed (finish, start) { - return Math.abs(new Date(finish) - new Date(start)) / 100 + return Math.abs(new Date(finish) - new Date(start)) / 1000 } } diff --git a/client/app/services/service-details/service-details-ansible.component.spec.js b/client/app/services/service-details/service-details-ansible.component.spec.js index bc2a3a890..ff26a6d0a 100644 --- a/client/app/services/service-details/service-details-ansible.component.spec.js +++ b/client/app/services/service-details/service-details-ansible.component.spec.js @@ -47,7 +47,7 @@ describe('Component: ServiceDetailsAnsibleComponent', function () { it('should calculate elapsed time', () => { ctrl.$onInit() const elapsedTime = ctrl.elapsed(1497908279, 1497908159) - expect(elapsedTime).to.eq(1.2) + expect(elapsedTime).to.eq(0.12) }) it('should allow onchanges to be called', (done) => { const getServiceCredentialSpy = sinon.stub(ServicesState, 'getServiceCredential').returns(Promise.resolve(successResponse))