From d9fea23c98fac617677cd196beb0b2b4d23bb5d0 Mon Sep 17 00:00:00 2001 From: Anton Beloglazov Date: Wed, 5 Dec 2012 15:46:45 +1100 Subject: [PATCH] Fixed tests of minimum_migration_time_max_cpu --- neat/locals/vm_selection/algorithms.py | 2 +- tests/locals/vm_selection/test_algorithms.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/neat/locals/vm_selection/algorithms.py b/neat/locals/vm_selection/algorithms.py index 42010eb..ceb0123 100644 --- a/neat/locals/vm_selection/algorithms.py +++ b/neat/locals/vm_selection/algorithms.py @@ -173,7 +173,7 @@ def minimum_migration_time_max_cpu(last_n, vms_cpu, vms_ram): if vms_ram[vm] > min_ram: continue vals = cpu[-last_n:] - avg = sum(vals) / len(vals) + avg = float(sum(vals)) / len(vals) if max_cpu < avg: max_cpu = avg selected_vm = vm diff --git a/tests/locals/vm_selection/test_algorithms.py b/tests/locals/vm_selection/test_algorithms.py index 0878368..f41d7f6 100644 --- a/tests/locals/vm_selection/test_algorithms.py +++ b/tests/locals/vm_selection/test_algorithms.py @@ -85,7 +85,7 @@ class Selection(TestCase): vms_cpu = dict((k, v[0]) for k, v in x.items()) vms_ram = dict((k, v[1]) for k, v in x.items()) min_ram = min(vms_ram.values()) - min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:])) + min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:])) for k, v in vms_cpu.items() if vms_ram[k] == min_ram and len(v[-last_n:]) > 0) values = min_ram_vms_cpu.values() @@ -108,7 +108,7 @@ class Selection(TestCase): 300, 20., {'last_n': last_n}) vms_ram = dict((k, ram) for k, _ in vms_cpu.items()) min_ram = min(vms_ram.values()) - min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:])) + min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:])) for k, v in vms_cpu.items() if vms_ram[k] == min_ram and len(v[-last_n:]) > 0) values = min_ram_vms_cpu.values() @@ -159,7 +159,7 @@ class Selection(TestCase): expect(selection).choice(x.keys()).and_return(vm).once() assert selection.random(x) == vm - @qc + @qc(10) def minimum_migration_time_max_cpu( x=dict_( keys=str_(of='abc123-', min_length=36, max_length=36), @@ -173,7 +173,7 @@ class Selection(TestCase): vms_cpu = dict((k, v[0]) for k, v in x.items()) vms_ram = dict((k, v[1]) for k, v in x.items()) min_ram = min(vms_ram.values()) - min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:])) + min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:])) for k, v in vms_cpu.items() if vms_ram[k] == min_ram and len(v[-last_n:]) > 0) values = min_ram_vms_cpu.values() @@ -182,7 +182,7 @@ class Selection(TestCase): assert selection.minimum_migration_time_max_cpu( last_n, vms_cpu, vms_ram) == vm - @qc(1) + @qc(10) def minimum_migration_time_max_cpu_equal_ram( vms_cpu=dict_( keys=str_(of='abc123-', min_length=36, max_length=36), @@ -195,7 +195,7 @@ class Selection(TestCase): ): vms_ram = dict((k, ram) for k, _ in vms_cpu.items()) min_ram = min(vms_ram.values()) - min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:])) + min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:])) for k, v in vms_cpu.items() if vms_ram[k] == min_ram and len(v[-last_n:]) > 0) values = min_ram_vms_cpu.values()