[haizea-commit] r561 - trunk/tests

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

Author: borja
Date: 2009-02-02 19:55:26 -0600 (Mon, 02 Feb 2009)
New Revision: 561

Added:
   trunk/tests/common.py
   trunk/tests/test_simul_notransfers.py
   trunk/tests/test_simul_transfers_noreuse.py
   trunk/tests/test_simul_transfers_reuse.py
Removed:
   trunk/tests/test_simulator.py
Log:
- Added more tests (including image transfers, with and without reuse)
- Cleaned up testing code

Added: trunk/tests/common.py
===================================================================
--- trunk/tests/common.py	                        (rev 0)
+++ trunk/tests/common.py	2009-02-03 01:55:26 UTC (rev 561)
@@ -0,0 +1,62 @@
+import ConfigParser
+
+from haizea.resourcemanager.configfile import HaizeaConfig
+from haizea.resourcemanager.rm import ResourceManager
+
+class BaseSimulatorTest(object):
+    def __init__(self):
+        pass
+    
+    def load_configfile(self, configfile):
+        file = open (configfile, "r")
+        c = ConfigParser.ConfigParser()
+        c.readfp(file)
+        return c
+
+    def set_tracefile(self, tracefile):
+        self.config.set("tracefile", "tracefile", tracefile)
+
+    def test_preemption(self):
+        self.set_tracefile("preemption.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_preemption_prematureend(self):
+        self.set_tracefile("preemption_prematureend.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_preemption_prematureend2(self):
+        self.set_tracefile("preemption_prematureend2.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_reservation(self):
+        self.set_tracefile("reservation.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_reservation_prematureend(self):
+        self.set_tracefile("reservation_prematureend.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_migrate(self):
+        self.set_tracefile("migrate.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_reuse1(self):
+        self.set_tracefile("reuse1.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_reuse2(self):
+        self.set_tracefile("reuse2.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
+        
+    def test_wait(self):
+        self.set_tracefile("wait.lwf")
+        rm = ResourceManager(HaizeaConfig(self.config))
+        rm.start()
\ No newline at end of file

Copied: trunk/tests/test_simul_notransfers.py (from rev 559, trunk/tests/test_simulator.py)
===================================================================
--- trunk/tests/test_simul_notransfers.py	                        (rev 0)
+++ trunk/tests/test_simul_notransfers.py	2009-02-03 01:55:26 UTC (rev 561)
@@ -0,0 +1,33 @@
+from common import BaseSimulatorTest
+
+class TestSimulator(BaseSimulatorTest):
+    def __init__(self):
+        self.config = self.load_configfile("base_config_simulator.conf")
+   
+    def test_preemption(self):
+        BaseSimulatorTest.test_preemption(self)
+        
+    def test_preemption_prematureend(self):
+        BaseSimulatorTest.test_preemption_prematureend(self)
+        
+    def test_preemption_prematureend2(self):
+        BaseSimulatorTest.test_preemption_prematureend2(self)
+
+    def test_reservation(self):
+        BaseSimulatorTest.test_reservation(self)
+        
+    def test_reservation_prematureend(self):
+        BaseSimulatorTest.test_reservation_prematureend(self)
+        
+    def test_migrate(self):
+        BaseSimulatorTest.test_migrate(self)
+        
+    def test_reuse1(self):
+        BaseSimulatorTest.test_reuse1(self)
+        
+    def test_reuse2(self):
+        BaseSimulatorTest.test_reuse2(self)
+        
+    def test_wait(self):
+        BaseSimulatorTest.test_wait(self)
+          
\ No newline at end of file


Property changes on: trunk/tests/test_simul_notransfers.py
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: trunk/tests/test_simul_transfers_noreuse.py
===================================================================
--- trunk/tests/test_simul_transfers_noreuse.py	                        (rev 0)
+++ trunk/tests/test_simul_transfers_noreuse.py	2009-02-03 01:55:26 UTC (rev 561)
@@ -0,0 +1,34 @@
+from common import BaseSimulatorTest
+
+class TestSimulator(BaseSimulatorTest):
+    def __init__(self):
+        self.config = self.load_configfile("base_config_simulator.conf")
+        self.config.set("general", "lease-preparation", "imagetransfer")
+   
+    def test_preemption(self):
+        BaseSimulatorTest.test_preemption(self)
+        
+    def test_preemption_prematureend(self):
+        BaseSimulatorTest.test_preemption_prematureend(self)
+        
+    def test_preemption_prematureend2(self):
+        BaseSimulatorTest.test_preemption_prematureend2(self)
+
+    def test_reservation(self):
+        BaseSimulatorTest.test_reservation(self)
+        
+    def test_reservation_prematureend(self):
+        BaseSimulatorTest.test_reservation_prematureend(self)
+        
+    def test_migrate(self):
+        BaseSimulatorTest.test_migrate(self)
+        
+    def test_reuse1(self):
+        BaseSimulatorTest.test_reuse1(self)
+        
+    def test_reuse2(self):
+        BaseSimulatorTest.test_reuse2(self)
+        
+    def test_wait(self):
+        BaseSimulatorTest.test_wait(self)
+          
\ No newline at end of file

Added: trunk/tests/test_simul_transfers_reuse.py
===================================================================
--- trunk/tests/test_simul_transfers_reuse.py	                        (rev 0)
+++ trunk/tests/test_simul_transfers_reuse.py	2009-02-03 01:55:26 UTC (rev 561)
@@ -0,0 +1,35 @@
+from common import BaseSimulatorTest
+
+class TestSimulator(BaseSimulatorTest):
+    def __init__(self):
+        self.config = self.load_configfile("base_config_simulator.conf")
+        self.config.set("general", "lease-preparation", "imagetransfer")
+        self.config.set("deploy-imagetransfer", "diskimage-reuse", "image-caches")
+   
+    def test_preemption(self):
+        BaseSimulatorTest.test_preemption(self)
+        
+    def test_preemption_prematureend(self):
+        BaseSimulatorTest.test_preemption_prematureend(self)
+        
+    def test_preemption_prematureend2(self):
+        BaseSimulatorTest.test_preemption_prematureend2(self)
+
+    def test_reservation(self):
+        BaseSimulatorTest.test_reservation(self)
+        
+    def test_reservation_prematureend(self):
+        BaseSimulatorTest.test_reservation_prematureend(self)
+        
+    def test_migrate(self):
+        BaseSimulatorTest.test_migrate(self)
+        
+    def test_reuse1(self):
+        BaseSimulatorTest.test_reuse1(self)
+        
+    def test_reuse2(self):
+        BaseSimulatorTest.test_reuse2(self)
+        
+    def test_wait(self):
+        BaseSimulatorTest.test_wait(self)
+          
\ No newline at end of file

Deleted: trunk/tests/test_simulator.py
===================================================================
--- trunk/tests/test_simulator.py	2009-02-03 01:54:47 UTC (rev 560)
+++ trunk/tests/test_simulator.py	2009-02-03 01:55:26 UTC (rev 561)
@@ -1,58 +0,0 @@
-import ConfigParser
-
-from haizea.resourcemanager.configfile import HaizeaConfig
-from haizea.resourcemanager.rm import ResourceManager
-
-
-def load_configfile(configfile, tracefile):
-    file = open (configfile, "r")
-    c = ConfigParser.ConfigParser()
-    c.readfp(file)
-    c.set("tracefile", "tracefile", tracefile)
-    cfg = HaizeaConfig(c)
-    return cfg
-    
-def test_preemption():
-    config = load_configfile("base_config_simulator.conf", "preemption.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_preemption_prematureend():
-    config = load_configfile("base_config_simulator.conf", "preemption_prematureend.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_preemption_prematureend2():
-    config = load_configfile("base_config_simulator.conf", "preemption_prematureend2.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_reservation():
-    config = load_configfile("base_config_simulator.conf", "reservation.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_reservation_prematureend():
-    config = load_configfile("base_config_simulator.conf", "reservation_prematureend.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_migrate():
-    config = load_configfile("base_config_simulator.conf", "migrate.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_reuse1():
-    config = load_configfile("base_config_simulator.conf", "reuse1.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_reuse2():
-    config = load_configfile("base_config_simulator.conf", "reuse2.lwf")
-    rm = ResourceManager(config)
-    rm.start()
-    
-def test_wait():
-    config = load_configfile("base_config_simulator.conf", "wait.lwf")
-    rm = ResourceManager(config)
-    rm.start()
\ No newline at end of file