From 7c9fa8fad96c039b96939f8df8d740ad6b50eec9 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 12 Mar 2014 12:59:46 +0100 Subject: ipaserver.install.service: Fix estimated time display Use basic math rather than timezone conversion to get minutes and seconds. Break out the message generation into a small tested function. https://fedorahosted.org/freeipa/ticket/4242 Reviewed-By: Rob Crittenden --- .../test_ipaserver/test_install/test_service.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 ipatests/test_ipaserver/test_install/test_service.py (limited to 'ipatests/test_ipaserver') diff --git a/ipatests/test_ipaserver/test_install/test_service.py b/ipatests/test_ipaserver/test_install/test_service.py new file mode 100644 index 000000000..956ae6256 --- /dev/null +++ b/ipatests/test_ipaserver/test_install/test_service.py @@ -0,0 +1,36 @@ +# Authors: +# Petr Viktorin +# +# Copyright (C) 2014 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +""" +Tests for the `ipaserver.service` module. +""" + +from ipaserver.install import service + + +def test_format_seconds(): + assert service.format_seconds(0) == '0 seconds' + assert service.format_seconds(1) == '1 second' + assert service.format_seconds(2) == '2 seconds' + assert service.format_seconds(11) == '11 seconds' + assert service.format_seconds(60) == '1 minute' + assert service.format_seconds(61) == '1 minute 1 second' + assert service.format_seconds(62) == '1 minute 2 seconds' + assert service.format_seconds(120) == '2 minutes' + assert service.format_seconds(125) == '2 minutes 5 seconds' -- cgit