From 565a78610e467f50ffd78effc0b4e1a00b9c84ae Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Tue, 21 Feb 2017 07:38:32 -0800 Subject: [PATCH] Fix floorfloat, and pep8 fixes for tests --- eos/mathUtils.py | 10 ++-------- tests/test_modules/gui/test_aboutData.py | 1 + tests/test_modules/service/test_attribute.py | 5 +++-- tests/test_package.py | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/eos/mathUtils.py b/eos/mathUtils.py index 5de12c60f..845bb4844 100644 --- a/eos/mathUtils.py +++ b/eos/mathUtils.py @@ -17,15 +17,9 @@ # along with eos. If not, see . # =============================================================================== -import decimal +from math import floor def floorFloat(value): - """Round float down to integer""" - # We have to convert float to str to keep compatibility with - # decimal module in python 2.6 - value = str(value) - # Do the conversions for proper rounding down, avoiding float - # representation errors - result = int(decimal.Decimal(value).to_integral_value(rounding=decimal.ROUND_DOWN)) + result = int(floor(value)) return result diff --git a/tests/test_modules/gui/test_aboutData.py b/tests/test_modules/gui/test_aboutData.py index f98cf3244..8e7e862d6 100644 --- a/tests/test_modules/gui/test_aboutData.py +++ b/tests/test_modules/gui/test_aboutData.py @@ -1,5 +1,6 @@ from gui.aboutData import versionString, licenses, developers, credits, description + def test_aboutData(): assert versionString.__len__() > 0 assert licenses.__len__() > 0 diff --git a/tests/test_modules/service/test_attribute.py b/tests/test_modules/service/test_attribute.py index a2215a17b..1ab44f2a8 100644 --- a/tests/test_modules/service/test_attribute.py +++ b/tests/test_modules/service/test_attribute.py @@ -1,5 +1,6 @@ from service.attribute import Attribute + def test_attribute(): """ We don't really have much to test here, to throw a generic attribute at it and validate we get the expected results @@ -19,13 +20,13 @@ def test_attribute(): assert type(info.description) is unicode assert info.displayName == 'Optimal Range' assert type(info.displayName) is unicode - assert info.highIsGood == True + assert info.highIsGood is True assert type(info.highIsGood) is bool assert info.iconID == 1391 assert type(info.iconID) is int assert info.name == 'maxRange' assert type(info.name) is unicode - assert info.published == True + assert info.published is True assert type(info.published) is bool assert info.unitID == 1 assert type(info.unitID) is int diff --git a/tests/test_package.py b/tests/test_package.py index 2788e4509..5f97967d7 100644 --- a/tests/test_package.py +++ b/tests/test_package.py @@ -2,10 +2,10 @@ import os import sys -import importlib +# import importlib # noinspection PyPackageRequirements -import pytest +# import pytest script_dir = os.path.dirname(os.path.abspath(__file__))