[haizea-commit] r759 - branches/1.1/tests

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-01-12 19:12:54 -0600 (Tue, 12 Jan 2010)
New Revision: 759

Added:
   branches/1.1/tests/deadline9.lwf
Modified:
   branches/1.1/tests/test_deadline.py
Log:
Added deadline test that verifies that preemptables leases are correctly ordered according to slack.

Added: branches/1.1/tests/deadline9.lwf
===================================================================
--- branches/1.1/tests/deadline9.lwf	                        (rev 0)
+++ branches/1.1/tests/deadline9.lwf	2010-01-13 01:12:54 UTC (rev 759)
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<lease-workload name="deadline8">
+  <description>
+    ...
+  </description>
+
+  <site>
+    <resource-types names="CPU Memory"/>
+    <nodes>
+      <node-set numnodes="4">
+        <res type="CPU" amount="100"/>
+        <res type="Memory" amount="1024"/>
+      </node-set>
+    </nodes>
+  </site>
+  <lease-requests>
+
+    <lease-request arrival="00:00:00.00">
+      <lease id="1" preemptible="true">
+        <nodes>
+          <node-set numnodes="2">
+            <res amount="100" type="CPU"/>
+            <res amount="1024" type="Memory"/>
+          </node-set>
+        </nodes>
+        <start>
+          <exact time="00:30:00.00"/>
+        </start>
+        <duration time="01:00:00.00"/>
+        <deadline time="10:00:00.00"/>
+        <software>
+          <disk-image id="foobar1.img" size="1024"/>
+        </software>
+      </lease>
+    </lease-request>
+    <lease-request arrival="00:00:00.00">
+      <lease id="2" preemptible="true">
+        <nodes>
+          <node-set numnodes="2">
+            <res amount="100" type="CPU"/>
+            <res amount="1024" type="Memory"/>
+          </node-set>
+        </nodes>
+        <start>
+          <exact time="00:30:00.00"/>
+        </start>
+        <duration time="01:00:00.00"/>
+        <deadline time="02:00:00.00"/>
+        <software>
+          <disk-image id="foobar1.img" size="1024"/>
+        </software>
+      </lease>
+    </lease-request>
+    <lease-request arrival="00:15:00.00">
+      <lease id="3" preemptible="true">
+        <nodes>
+          <node-set numnodes="2">
+            <res amount="100" type="CPU"/>
+            <res amount="1024" type="Memory"/>
+          </node-set>
+        </nodes>
+        <start>
+          <exact time="00:45:00.00"/>
+        </start>
+        <duration time="00:30:00.00"/>
+        <deadline time="01:15:00.00"/>
+        <software>
+          <disk-image id="foobar1.img" size="1024"/>
+        </software>
+      </lease>
+    </lease-request>
+  </lease-requests>
+</lease-workload>
+    
\ No newline at end of file

Modified: branches/1.1/tests/test_deadline.py
===================================================================
--- branches/1.1/tests/test_deadline.py	2010-01-13 01:12:26 UTC (rev 758)
+++ branches/1.1/tests/test_deadline.py	2010-01-13 01:12:54 UTC (rev 759)
@@ -41,4 +41,12 @@
         self._tracefile_test("deadline8.lwf")
         self._verify_done([1,2])          
         self._verify_rejected([3])
-                                
\ No newline at end of file
+                                
+    def test_deadline9_1(self):
+        self._tracefile_test("deadline9.lwf")
+        self._verify_done([1,2,3])
+        
+    def test_deadline9_2(self):
+        self.config.set("scheduling", "suspension", "none")        
+        self._tracefile_test("deadline9.lwf")
+        self._verify_done([1,2,3])        
\ No newline at end of file