Improved LinuxApplication behavior

[nepi.git] / test / execution / resource.py

diff --git a/test/execution/resource.py b/test/execution/resource.py
index cb9423d..7122b92 100755 (executable)
--- a/test/execution/resource.py
+++ b/test/execution/resource.py
@@ -1,8 +1,29 @@
 #!/usr/bin/env python
+#
+#    NEPI, a framework to manage network experiments
+#    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.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+
+
 from nepi.execution.attribute import Attribute
 from nepi.execution.ec import ExperimentController 
 from nepi.execution.resource import ResourceManager, ResourceState, clsinit
 
+import random
 import time
 import unittest
 
@@ -106,9 +127,15 @@ class Application(ResourceManager):
         if node.state < ResourceState.READY:
             self.ec.schedule("0.5s", self.deploy)
         else:
+            time.sleep(random.random() * 5)
             super(Application, self).deploy()
             self.logger.debug(" -------- DEPLOYED ------- ")
 
+    def start(self):
+        super(Application, self).start()
+        time.sleep(random.random() * 5)
+        self._state = ResourceState.FINISHED
+
 class ResourceManagerTestCase(unittest.TestCase):
     def test_deploy_in_order(self):
         """
@@ -149,10 +176,8 @@ class ResourceManagerTestCase(unittest.TestCase):
 
         ec.deploy()
 
-        while not all([ ec.state(guid) == ResourceState.STARTED \
-                for guid in [app1, app2, node1, node2, iface1, iface2, chan]]) \
-                and not ec.finished:
-            time.sleep(0.5)
+        guids = [app1, app2]
+        ec.wait_finished(guids)
 
         ec.shutdown()
 
@@ -181,6 +206,36 @@ class ResourceManagerTestCase(unittest.TestCase):
         self.assertTrue(rmchan.ready_time < rmiface1.ready_time)
         self.assertTrue(rmchan.ready_time < rmiface2.ready_time)
 
+    def test_concurrency(self):
+        from nepi.execution.resource import ResourceFactory
+        
+        ResourceFactory.register_type(Application)
+        ResourceFactory.register_type(Node)
+        ResourceFactory.register_type(Interface)
+        ResourceFactory.register_type(Channel)
+
+        ec = ExperimentController()
+
+        node = ec.register_resource("Node")
+
+        apps = list()
+        for i in xrange(1000):
+            app = ec.register_resource("Application")
+            ec.register_connection(app, node)
+            apps.append(app)
+
+        ec.deploy()
+
+        ec.wait_finished(apps)
+        
+        self.assertTrue(ec.state(node) == ResourceState.STARTED)
+        self.assertTrue(
+               all([ec.state(guid) == ResourceState.FINISHED \
+                for guid in apps])
+                )
+
+        ec.shutdown()
+
     def test_start_with_condition(self):
         # TODO!!!
         pass