X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Futil%2Fserializer.py;h=c0f0e3a443e08067941e834183457c4dbe3b9ab2;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=7d7cf6a811bf303aa6e7982ce70cbf5fb951c364;hpb=561719f7cb8a42f139905c33e75ec5071c321170;p=nepi.git

diff --git a/test/util/serializer.py b/test/util/serializer.py
index 7d7cf6a8..c0f0e3a4 100755
--- a/test/util/serializer.py
+++ b/test/util/serializer.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +21,10 @@ from nepi.execution.ec import ExperimentController
 from nepi.execution.resource import ResourceManager, ResourceState, \
         clsinit_copy, ResourceAction, ResourceFactory
 
+import os
 import tempfile
 import time
+import shutil
 import unittest
 
 reschedule_delay = "0.5s"
@@ -86,7 +87,7 @@ ResourceFactory.register_type(Node)
 ResourceFactory.register_type(Interface)
 ResourceFactory.register_type(Link)
 
-class SerializeTestCase(unittest.TestCase):
+class SerializerTestCase(unittest.TestCase):
     def test_serialize(self):
         node_count = 4
         app_count = 2
@@ -100,7 +101,7 @@ class SerializeTestCase(unittest.TestCase):
         apps = list()
         ifaces = list()
 
-        for i in xrange(node_count):
+        for i in range(node_count):
             node = ec.register_resource("dummy::Node")
             nodes.append(node)
             
@@ -108,7 +109,7 @@ class SerializeTestCase(unittest.TestCase):
             ec.register_connection(node, iface)
             ifaces.append(iface)
 
-            for i in xrange(app_count):
+            for i in range(app_count):
                 app = ec.register_resource("dummy::Application")
                 ec.register_connection(node, app)
                 apps.append(app)
@@ -119,7 +120,6 @@ class SerializeTestCase(unittest.TestCase):
             ec.register_connection(link, iface)
 
         filepath = ec.save(dirpath)
-        print filepath
 
         ec.deploy()
 
@@ -129,14 +129,16 @@ class SerializeTestCase(unittest.TestCase):
         # Do the experiment controller shutdown
         ec.shutdown()
 
+        # Load serialized experiment
         ec2 = ExperimentController.load(filepath)
-        apps = ec2.get_resources_by_type("dummy::Application")
+        apps = ec2.filter_resources("dummy::Application")
         ec2.deploy()
         ec2.wait_finished(apps)
         ec2.shutdown()
         
-        self.assertEquals(len(ec.resources), len(ec2.resources))
+        self.assertEqual(len(ec.resources), len(ec2.resources))
 
+        shutil.rmtree(dirpath)
                        
 if __name__ == '__main__':
     unittest.main()