]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume tests.util update to reflect Size object changes
authorAlfredo Deza <adeza@redhat.com>
Wed, 8 Aug 2018 16:55:16 +0000 (12:55 -0400)
committerAlfredo Deza <adeza@redhat.com>
Fri, 10 Aug 2018 17:14:31 +0000 (13:14 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/tests/util/test_disk.py

index f3c96de45890e8495287f42121ab22c023d27ecb..71bfbbc326988180f88f3afd5845db3d56ad851a 100644 (file)
@@ -383,7 +383,7 @@ class TestSizeOperations(object):
 
     def test_self_addition_with_size_objects(self):
         base = disk.Size(mb=256)
-        base + disk.Size(gb=1)
+        base += disk.Size(gb=1)
         assert base.gb == 1.25
 
     def test_addition_with_non_size_objects(self):
@@ -392,7 +392,7 @@ class TestSizeOperations(object):
 
     def test_assignment_subtraction_with_size_objects(self):
         base = disk.Size(gb=1)
-        base - disk.Size(mb=256)
+        base -= disk.Size(mb=256)
         assert base.mb == 768
 
     def test_subtraction_with_size_objects(self):
@@ -409,12 +409,12 @@ class TestSizeOperations(object):
 
     def test_multiplication_with_non_size_objects(self):
         base = disk.Size(gb=1)
-        base * 2
-        assert base.gb == 2
+        result = base * 2
+        assert result.gb == 2
 
     def test_division_with_size_objects(self):
-        with pytest.raises(TypeError):
-            disk.Size(gb=1) * disk.Size(mb=1)
+        result = disk.Size(gb=1) / disk.Size(mb=1)
+        assert int(result) == 1024
 
     def test_division_with_non_size_objects(self):
         base = disk.Size(gb=1)