[haizea-commit] r806 - branches/1.1/tests
haizea-commit at mailman.cs.uchicago.edu
haizea-commit at mailman.cs.uchicago.edu
Tue Jun 22 13:33:47 CDT 2010
Author: borja
Date: 2010-06-22 13:33:47 -0500 (Tue, 22 Jun 2010)
New Revision: 806
Modified:
branches/1.1/tests/base_config_simulator.conf
branches/1.1/tests/test_deadline.py
branches/1.1/tests/test_deadline_nosusp.py
branches/1.1/tests/test_simul_pricing.py
Log:
Several bug fixes in unit tests. Some of the deadline tests are currently still failing.
Modified: branches/1.1/tests/base_config_simulator.conf
===================================================================
--- branches/1.1/tests/base_config_simulator.conf 2010-06-22 17:06:00 UTC (rev 805)
+++ branches/1.1/tests/base_config_simulator.conf 2010-06-22 18:33:47 UTC (rev 806)
@@ -18,7 +18,7 @@
policy-admission: accept-all
policy-preemption: ar-preempts-everything
policy-host-selection: greedy
-shutdown-time: 10
+shutdown-time: 0
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:06:00 UTC (rev 805)
+++ branches/1.1/tests/test_deadline.py 2010-06-22 18:33:47 UTC (rev 806)
@@ -3,6 +3,7 @@
def get_config():
c = load_configfile("base_config_simulator.conf")
+ c.set("scheduling", "mapper", "deadline")
c.set("scheduling", "policy-preemption", "deadline")
c.set("scheduling", "suspension", "all")
return c
@@ -64,134 +65,115 @@
verify_done(h, [1,2,3])
def test_deadline9_2():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
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():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline10-2.lwf")
h.start()
verify_done(h, [1,2,3])
def test_deadline10_3():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline10-3.lwf")
h.start()
verify_done(h, [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():
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():
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():
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():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline10-8.lwf")
h.start()
verify_done(h, [1,2,3])
def test_deadline10_9():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline10-9.lwf")
h.start()
verify_done(h, [1,2,3])
def test_deadline10_10():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline10-10.lwf")
h.start()
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():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline10-12.lwf")
h.start()
verify_done(h, [1,2,3])
def test_deadline11_1():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline11-1.lwf")
h.start()
verify_done(h, [1,2,3])
def test_deadline11_2():
- c = get_config()
- c.set("scheduling", "suspension", "none")
+ c = get_config()
h = load_tracefile(c, "deadline11-2.lwf")
h.start()
verify_done(h, [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")
+ c = get_config()
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():
c = get_config()
- c.set("scheduling", "suspension", "none")
h = load_tracefile(c, "deadline15.lwf")
h.start()
verify_done(h, [1,2,3])
@@ -199,7 +181,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])
Modified: branches/1.1/tests/test_deadline_nosusp.py
===================================================================
--- branches/1.1/tests/test_deadline_nosusp.py 2010-06-22 17:06:00 UTC (rev 805)
+++ branches/1.1/tests/test_deadline_nosusp.py 2010-06-22 18:33:47 UTC (rev 806)
@@ -1,104 +1,155 @@
-from common import BaseTest
+from common import *
from haizea.core.leases import Lease
-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", "none")
+def get_config():
+ c = load_configfile("base_config_simulator.conf")
+ c.set("scheduling", "mapper", "deadline")
+ c.set("scheduling", "policy-preemption", "deadline")
+ c.set("scheduling", "suspension", "none")
+ 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()
+ h = load_tracefile(c, "deadline9.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
+
+def test_deadline10_1():
+ c = get_config()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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()
+ 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])
\ No newline at end of file
+def test_deadline11_2():
+ c = get_config()
+ h = load_tracefile(c, "deadline11-2.lwf")
+ h.start()
+ verify_done(h, [1,2,3])
Modified: branches/1.1/tests/test_simul_pricing.py
===================================================================
--- branches/1.1/tests/test_simul_pricing.py 2010-06-22 17:06:00 UTC (rev 805)
+++ branches/1.1/tests/test_simul_pricing.py 2010-06-22 18:33:47 UTC (rev 806)
@@ -31,6 +31,7 @@
def test_pricing_surcharge():
c = get_config()
+ c.set("scheduling", "mapper", "deadline")
c.set("scheduling", "policy-preemption", "deadline")
c.set("scheduling", "suspension", "all")
c.set("scheduling", "policy-pricing", "constant")
More information about the Haizea-commit
mailing list