diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc')
2 files changed, 14 insertions, 14 deletions
diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt index 5ad1ecde..301d507b 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt @@ -110,16 +110,16 @@ class ScenarioIntegrationTest { "Success=${monitor.attemptsSuccess} " + "Failure=${monitor.attemptsFailure} " + "Error=${monitor.attemptsError} " + - "Pending=${monitor.serversPending} " + - "Active=${monitor.serversActive}", + "Pending=${monitor.tasksPending} " + + "Active=${monitor.tasksActive}", ) // Note that these values have been verified beforehand assertAll( { assertEquals(50, monitor.attemptsSuccess, "The scheduler should schedule 50 VMs") }, - { assertEquals(0, monitor.serversActive, "All VMs should finish after a run") }, + { assertEquals(0, monitor.tasksActive, "All VMs should finish after a run") }, { assertEquals(0, monitor.attemptsFailure, "No VM should be unscheduled") }, - { assertEquals(0, monitor.serversPending, "No VM should not be in the queue") }, + { assertEquals(0, monitor.tasksPending, "No VM should not be in the queue") }, { assertEquals(43795971955, monitor.idleTime) { "Incorrect idle time" } }, { assertEquals(2864995687, monitor.activeTime) { "Incorrect active time" } }, { assertEquals(148, monitor.stealTime) { "Incorrect steal time" } }, @@ -156,8 +156,8 @@ class ScenarioIntegrationTest { "Success=${monitor.attemptsSuccess} " + "Failure=${monitor.attemptsFailure} " + "Error=${monitor.attemptsError} " + - "Pending=${monitor.serversPending} " + - "Active=${monitor.serversActive}", + "Pending=${monitor.tasksPending} " + + "Active=${monitor.tasksActive}", ) // Note that these values have been verified beforehand @@ -197,8 +197,8 @@ class ScenarioIntegrationTest { "Success=${monitor.attemptsSuccess} " + "Failure=${monitor.attemptsFailure} " + "Error=${monitor.attemptsError} " + - "Pending=${monitor.serversPending} " + - "Active=${monitor.serversActive}", + "Pending=${monitor.tasksPending} " + + "Active=${monitor.tasksActive}", ) // Note that these values have been verified beforehand @@ -265,15 +265,15 @@ class ScenarioIntegrationTest { var attemptsSuccess = 0 var attemptsFailure = 0 var attemptsError = 0 - var serversPending = 0 - var serversActive = 0 + var tasksPending = 0 + var tasksActive = 0 override fun record(reader: ServiceTableReader) { attemptsSuccess = reader.attemptsSuccess attemptsFailure = reader.attemptsFailure attemptsError = reader.attemptsError - serversPending = reader.serversPending - serversActive = reader.serversActive + tasksPending = reader.tasksPending + tasksActive = reader.tasksActive } var idleTime = 0L diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt index f10ab310..0b32b8f6 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt @@ -51,7 +51,7 @@ class ScenarioRunnerTest { Topology("topology"), Workload("bitbrains-small", trace("bitbrains-small")), OperationalPhenomena(failureFrequency = 24.0 * 7, hasInterference = true), - "active-servers" + "active-tasks" ) assertDoesNotThrow { runner.runScenario(scenario, seed = 0L) } @@ -70,7 +70,7 @@ class ScenarioRunnerTest { Topology("topology"), Workload("bitbrains-small", trace("bitbrains-small")), OperationalPhenomena(failureFrequency = 24.0 * 7, hasInterference = true), - "active-servers" + "active-tasks" ) assertDoesNotThrow { runner.runScenario(scenario, seed = 0L) } |