[master 1/4] Pass floats as string to Decimal constructor everywhere.
mulkieran
installerbot-noreply at redhat.com
Tue May 26 16:58:06 UTC 2015
From: Anne Mulhern <amulhern at redhat.com>
Usually what people mean by literal 1.3 is 1 3/10. "1.3" is interpreted
by Decimal as exactly that, but 1.3 is interpreted as
Decimal('1.3000000000000000444089209850062616169452667236328125').
Signed-off-by: Anne Mulhern <amulhern at redhat.com>
---
tests/size_test.py | 8 ++++----
tests/util_test.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/size_test.py b/tests/size_test.py
index 7c12624..0556099 100644
--- a/tests/size_test.py
+++ b/tests/size_test.py
@@ -43,7 +43,7 @@ class SizeTestCase(unittest.TestCase):
def testExceptions(self):
zero = Size(0)
- self.assertEqual(zero, Size(0.0))
+ self.assertEqual(zero, Size("0.0"))
s = Size(500)
with self.assertRaises(SizePlacesError):
@@ -170,7 +170,7 @@ def testMinValue(self):
s = Size("0.5 GiB")
self.assertEquals(s.humanReadable(max_places=2, min_value=1), "512 MiB")
- self.assertEquals(s.humanReadable(max_places=2, min_value=Decimal(0.1)), "0.5 GiB")
+ self.assertEquals(s.humanReadable(max_places=2, min_value=Decimal("0.1")), "0.5 GiB")
self.assertEquals(s.humanReadable(max_places=2, min_value=Decimal(1)), "512 MiB")
def testConvertToPrecision(self):
@@ -178,7 +178,7 @@ def testConvertToPrecision(self):
self.assertEquals(s.convertTo(None), 1835008)
self.assertEquals(s.convertTo(B), 1835008)
self.assertEquals(s.convertTo(KiB), 1792)
- self.assertEquals(s.convertTo(MiB), 1.75)
+ self.assertEquals(s.convertTo(MiB), Decimal("1.75"))
def testNegative(self):
s = Size("-500MiB")
@@ -186,7 +186,7 @@ def testNegative(self):
self.assertEquals(s.convertTo(B), -524288000)
def testPartialBytes(self):
- self.assertEquals(Size(1024.6), Size(1024))
+ self.assertEquals(Size("1024.6"), Size(1024))
self.assertEquals(Size("%s KiB" % (1/1025.0,)), Size(0))
self.assertEquals(Size("%s KiB" % (1/1023.0,)), Size(1))
diff --git a/tests/util_test.py b/tests/util_test.py
index fe7a841..6f3a02e 100644
--- a/tests/util_test.py
+++ b/tests/util_test.py
@@ -14,7 +14,7 @@ class MiscTest(unittest.TestCase):
def test_power_of_two(self):
self.assertFalse(util.power_of_two(None))
self.assertFalse(util.power_of_two("not a number"))
- self.assertFalse(util.power_of_two(Decimal(2.2)))
+ self.assertFalse(util.power_of_two(Decimal("2.2")))
self.assertFalse(util.power_of_two(-1))
self.assertFalse(util.power_of_two(0))
self.assertFalse(util.power_of_two(1))
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/99a715039a556c358cc71a51c850cb70fd4fdcca
More information about the anaconda-patches
mailing list