[haizea-commit] r804 - branches/1.1/tests
haizea-commit at mailman.cs.uchicago.edu
haizea-commit at mailman.cs.uchicago.edu
Tue Jun 22 12:04:45 CDT 2010
Author: borja
Date: 2010-06-22 12:04:45 -0500 (Tue, 22 Jun 2010)
New Revision: 804
Modified:
branches/1.1/tests/base_config_simulator.conf
branches/1.1/tests/test_deadline.py
branches/1.1/tests/test_simul_notransfers.py
branches/1.1/tests/test_simul_pricing.py
Log:
- Changed unit tests to use test_* functions instead of Test* classes. Newer py.test is apparently not too happy about test classes having a constructor.
- Minor changes.
Modified: branches/1.1/tests/base_config_simulator.conf
===================================================================
--- branches/1.1/tests/base_config_simulator.conf 2010-06-22 17:01:20 UTC (rev 803)
+++ branches/1.1/tests/base_config_simulator.conf 2010-06-22 17:04:45 UTC (rev 804)
@@ -11,13 +11,14 @@
resources: in-tracefile
imagetransfer-bandwidth: 100
#status-message-interval: 15
+sanity-check: true
[scheduling]
mapper: greedy
policy-admission: accept-all
policy-preemption: ar-preempts-everything
policy-host-selection: greedy
-shutdown-time: 0
+shutdown-time: 10
suspendresume-exclusion: local
wakeup-interval: 3
backfilling: aggressive
Modified: branches/1.1/tests/test_deadline.py
===================================================================
--- branches/1.1/tests/test_deadline.py 2010-06-22 17:01:20 UTC (rev 803)
+++ branches/1.1/tests/test_deadline.py 2010-06-22 17:04:45 UTC (rev 804)
@@ -1,125 +1,206 @@
-from common import BaseTest
from haizea.core.leases import Lease
+from common import *
-class TestSimulator(BaseTest):
- def __init__(self):
- config = BaseTest.load_configfile("base_config_simulator.conf")
- BaseTest.__init__(self, config)
- self.config.set("scheduling", "mapper", "deadline")
- self.config.set("scheduling", "policy-preemption", "deadline")
- self.config.set("scheduling", "suspension", "all")
+def get_config():
+ c = load_configfile("base_config_simulator.conf")
+ c.set("scheduling", "policy-preemption", "deadline")
+ c.set("scheduling", "suspension", "all")
+ return c
+
+def test_deadline1():
+ c = get_config()
+ h = load_tracefile(c, "deadline1.lwf")
+ h.start()
+ verify_done(h, [1,2])
+
+def test_deadline2():
+ c = get_config()
+ h = load_tracefile(c, "deadline2.lwf")
+ h.start()
+ verify_done(h, [1,2])
+
+def test_deadline3():
+ c = get_config()
+ h = load_tracefile(c, "deadline3.lwf")
+ h.start()
+ verify_done(h, [1,2])
+
+def test_deadline4():
+ c = get_config()
+ h = load_tracefile(c, "deadline4.lwf")
+ h.start()
+ verify_done(h, [1])
+ verify_rejected(h, [2])
- def test_deadline1(self):
- self._tracefile_test("deadline1.lwf")
- self._verify_done([1,2])
-
- def test_deadline2(self):
- self._tracefile_test("deadline2.lwf")
- self._verify_done([1,2])
-
- def test_deadline3(self):
- self._tracefile_test("deadline3.lwf")
- self._verify_done([1,2])
-
- def test_deadline4(self):
- self._tracefile_test("deadline4.lwf")
- self._verify_done([1])
- self._verify_rejected([2])
-
- def test_deadline5(self):
- self._tracefile_test("deadline5.lwf")
- self._verify_done([1,2])
+def test_deadline5():
+ c = get_config()
+ h = load_tracefile(c, "deadline5.lwf")
+ h.start()
+ verify_done(h, [1,2])
- def test_deadline6(self):
- self._tracefile_test("deadline6.lwf")
- self._verify_done([1,2,3])
-
- def test_deadline7(self):
- self._tracefile_test("deadline7.lwf")
- self._verify_done([1,2,3])
-
- def test_deadline8(self):
- self._tracefile_test("deadline8.lwf")
- self._verify_done([1,2])
- self._verify_rejected([3])
-
- def test_deadline9(self):
- self._tracefile_test("deadline9.lwf")
- self._verify_done([1,2,3])
-
- def test_deadline10_1(self):
- self._tracefile_test("deadline10-1.lwf")
- self._verify_done([1,2,3])
+def test_deadline6():
+ c = get_config()
+ h = load_tracefile(c, "deadline6.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+
+def test_deadline7():
+ c = get_config()
+ h = load_tracefile(c, "deadline7.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+
+def test_deadline8():
+ c = get_config()
+ h = load_tracefile(c, "deadline8.lwf")
+ h.start()
+ verify_done(h, [1,2])
+ verify_rejected(h, [3])
+
+def test_deadline9_1():
+ c = get_config()
+ h = load_tracefile(c, "deadline9.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+
+def test_deadline9_2():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline9.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+
+def test_deadline10_1():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-1.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_2(self):
- self._tracefile_test("deadline10-2.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_2():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-2.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_3(self):
- self._tracefile_test("deadline10-3.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_3():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-3.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_4(self):
- self._tracefile_test("deadline10-4.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_4():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-4.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_5(self):
- self._tracefile_test("deadline10-5.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_5():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-5.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_6(self):
- self._tracefile_test("deadline10-6.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_6():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-6.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_7(self):
- self._tracefile_test("deadline10-7.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_7():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-7.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_8(self):
- self._tracefile_test("deadline10-8.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_8():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-8.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_9(self):
- self._tracefile_test("deadline10-9.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_9():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-9.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_10(self):
- self._tracefile_test("deadline10-10.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_10():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-10.lwf")
+ h.start()
+ verify_done([1,2,3])
- def test_deadline10_11(self):
- self._tracefile_test("deadline10-11.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_11():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-11.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline10_12(self):
- self._tracefile_test("deadline10-12.lwf")
- self._verify_done([1,2,3])
+def test_deadline10_12():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline10-12.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline11_1(self):
- self._tracefile_test("deadline11-1.lwf")
- self._verify_done([1,2,3])
+def test_deadline11_1():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline11-1.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline11_2(self):
- self._tracefile_test("deadline11-2.lwf")
- self._verify_done([1,2,3])
+def test_deadline11_2():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline11-2.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline12(self):
- self._tracefile_test("deadline12.lwf")
- self._verify_done([1,2,3,4,5,6,7,8])
-
- def test_deadline13(self):
- self._tracefile_test("deadline13.lwf")
- self._verify_done([1,2,3])
-
- def test_deadline14(self):
- self._tracefile_test("deadline14.lwf")
- self._verify_done([1,2,3])
+def test_deadline12():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline12.lwf")
+ h.start()
+ verify_done(h, [1,2,3,4,5,6,7,8])
+
+def test_deadline13():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline13.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+
+def test_deadline14():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline14.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
- def test_deadline15(self):
- self._tracefile_test("deadline15.lwf")
- self._verify_done([1,2,3])
- self._verify_rejected([4])
+def test_deadline15():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline15.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+ verify_rejected(h, [4])
- def test_deadline16(self):
- self._tracefile_test("deadline16.lwf")
- self._verify_done([1,2,3,4,5,6])
+def test_deadline16():
+ c = get_config()
+ c.set("scheduling", "suspension", "none")
+ h = load_tracefile(c, "deadline16.lwf")
+ h.start()
+ verify_done(h, [1,2,3,4,5,6])
+
\ No newline at end of file
Modified: branches/1.1/tests/test_simul_notransfers.py
===================================================================
--- branches/1.1/tests/test_simul_notransfers.py 2010-06-22 17:01:20 UTC (rev 803)
+++ branches/1.1/tests/test_simul_notransfers.py 2010-06-22 17:04:45 UTC (rev 804)
@@ -1,45 +1,40 @@
-from common import BaseSimulatorTest
+from common import *
-class TestSimulator(BaseSimulatorTest):
- def __init__(self):
- config = BaseSimulatorTest.load_configfile("base_config_simulator.conf")
- BaseSimulatorTest.__init__(self, config)
+def get_config():
+ return load_configfile("base_config_simulator.conf")
- def test_preemption(self):
- BaseSimulatorTest.test_preemption(self)
- self._verify_done([1,2])
+def test_preemption():
+ h = load_tracefile(get_config(), PREEMPTION_TRACE)
+ h.start()
+
+def test_preemption_prematureend():
+ h = load_tracefile(get_config(), PREEMPTION_PREMATUREEND_TRACE)
+ h.start()
- def test_preemption_prematureend(self):
- BaseSimulatorTest.test_preemption_prematureend(self)
- self._verify_done([1,2])
-
- def test_preemption_prematureend2(self):
- BaseSimulatorTest.test_preemption_prematureend2(self)
- self._verify_done([1,2])
-
- def test_reservation(self):
- BaseSimulatorTest.test_reservation(self)
- self._verify_done([1,2])
+def test_preemption_prematureend2():
+ h = load_tracefile(get_config(), PREEMPTION_PREMATUREEND2_TRACE)
+ h.start()
- def test_reservation_prematureend(self):
- BaseSimulatorTest.test_reservation_prematureend(self)
- self._verify_done([1,2])
+def test_reservation():
+ h = load_tracefile(get_config(), RESERVATION_TRACE)
+ h.start()
- def test_migrate(self):
- BaseSimulatorTest.test_migrate(self)
- self._verify_done([1,3])
+def test_reservation_prematureend():
+ h = load_tracefile(get_config(), RESERVATION_PREMATUREEND_TRACE)
+ h.start()
- def test_reuse1(self):
- BaseSimulatorTest.test_reuse1(self)
- self._verify_done([1,2])
+def test_migrate():
+ h = load_tracefile(get_config(), MIGRATE_TRACE)
+ h.start()
- def test_reuse2(self):
- BaseSimulatorTest.test_reuse2(self)
- self._verify_done([1,2,3])
+def test_reuse1():
+ h = load_tracefile(get_config(), REUSE1_TRACE)
+ h.start()
- def test_wait(self):
- BaseSimulatorTest.test_wait(self)
-
- def test_prematureend_in_start(self):
- self.config.set("scheduling", "override-suspend-time", "30")
- self._tracefile_test("prematureend_in_start.lwf")
\ No newline at end of file
+def test_reuse2():
+ h = load_tracefile(get_config(), REUSE2_TRACE)
+ h.start()
+
+def test_wait():
+ h = load_tracefile(get_config(), WAIT_TRACE)
+ h.start()
Modified: branches/1.1/tests/test_simul_pricing.py
===================================================================
--- branches/1.1/tests/test_simul_pricing.py 2010-06-22 17:01:20 UTC (rev 803)
+++ branches/1.1/tests/test_simul_pricing.py 2010-06-22 17:04:45 UTC (rev 804)
@@ -1,34 +1,40 @@
-from common import BaseTest
from haizea.core.leases import Lease
+from common import *
-class TestSimulator(BaseTest):
- def __init__(self):
- config = BaseTest.load_configfile("base_config_simulator.conf")
- BaseTest.__init__(self, config)
- self.config.add_section("pricing")
-
- def test_pricing1(self):
- self.config.set("scheduling", "policy-pricing", "free")
- self._tracefile_test("price1.lwf")
- self._verify_done([1])
+def get_config():
+ c = load_configfile("base_config_simulator.conf")
+ c.add_section("pricing")
+ return c
+
+def test_pricing1():
+ c = get_config()
+ c.set("scheduling", "policy-pricing", "free")
+ h = load_tracefile(c, "price1.lwf")
+ h.start()
+ verify_done(h, [1])
- def test_pricing2(self):
- self.config.set("scheduling", "policy-pricing", "constant")
- self.config.set("pricing", "rate", "0.10")
- self._tracefile_test("price1.lwf")
- self._verify_done([1])
-
- def test_pricing3(self):
- self.config.set("scheduling", "policy-pricing", "constant")
- self.config.set("pricing", "rate", "1.00")
- self._tracefile_test("price2.lwf")
- self._verify_rejected_by_user([1])
-
- def test_pricing_surcharge(self):
- self.config.set("scheduling", "mapper", "deadline")
- self.config.set("scheduling", "policy-preemption", "deadline")
- self.config.set("scheduling", "suspension", "all")
- self.config.set("scheduling", "policy-pricing", "constant")
- self.config.set("pricing", "rate", "0.10")
- self._tracefile_test("pricedeadline.lwf")
- self._verify_done([1])
\ No newline at end of file
+def test_pricing2():
+ c = get_config()
+ c.set("scheduling", "policy-pricing", "constant")
+ c.set("pricing", "rate", "0.10")
+ h = load_tracefile(c, "price1.lwf")
+ h.start()
+ verify_done(h, [1])
+
+def test_pricing3():
+ c = get_config()
+ c.set("scheduling", "policy-pricing", "constant")
+ c.set("pricing", "rate", "1.00")
+ h = load_tracefile(c, "price2.lwf")
+ h.start()
+ verify_rejected_by_user(h, [1])
+
+def test_pricing_surcharge():
+ c = get_config()
+ c.set("scheduling", "policy-preemption", "deadline")
+ c.set("scheduling", "suspension", "all")
+ c.set("scheduling", "policy-pricing", "constant")
+ c.set("pricing", "rate", "0.10")
+ h = load_tracefile(c, "pricedeadline.lwf")
+ h.start()
+ verify_done(h, [1])
\ No newline at end of file
More information about the Haizea-commit
mailing list