From c01150e19e8d2609c944222ac1534f6bbf0d2efa Mon Sep 17 00:00:00 2001 From: Julien Tribino Date: Wed, 18 Dec 2013 11:42:50 +0100 Subject: [PATCH] update some tests that were failing --- test/execution/resource.py | 6 +++--- test/resources/linux/application.py | 14 +++++++------- test/resources/omf/vlc_wrong_non_critical.py | 9 ++++++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/test/execution/resource.py b/test/execution/resource.py index fa3277a7..d3cc9115 100755 --- a/test/execution/resource.py +++ b/test/execution/resource.py @@ -117,7 +117,7 @@ class Application(ResourceManager): def do_start(self): super(Application, self).do_start() time.sleep(random.random() * 3) - self.ec.schedule("0.5s", self.finish) + self.ec.schedule("0.5s", self.stop) class ErrorApplication(ResourceManager): _rtype = "ErrorApplication" @@ -280,7 +280,7 @@ class ResourceManagerTestCase(unittest.TestCase): self.assertTrue(ec.state(node) == ResourceState.STARTED) self.assertTrue( - all([ec.state(guid) == ResourceState.FINISHED \ + all([ec.state(guid) == ResourceState.STOPPED \ for guid in apps]) ) @@ -343,7 +343,7 @@ class ResourceManagerTestCase(unittest.TestCase): for app in apps: state = ec.state(app) - self.assertEquals(state, ResourceState.FINISHED) + self.assertEquals(state, ResourceState.STOPPED) ec.shutdown() diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py index 934081c1..8d8fe215 100755 --- a/test/resources/linux/application.py +++ b/test/resources/linux/application.py @@ -60,7 +60,7 @@ class LinuxApplicationTestCase(unittest.TestCase): ec.wait_finished(app) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) stdout = ec.trace(app, "stdout") self.assertTrue(stdout.strip() == "HOLA") @@ -89,7 +89,7 @@ class LinuxApplicationTestCase(unittest.TestCase): ec.wait_finished(app) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) stdout = ec.trace(app, "stdout") size = ec.trace(app, "stdout", attr = TraceAttr.SIZE) @@ -169,7 +169,7 @@ main (void) self.assertTrue(ec.state(node) == ResourceState.STARTED) self.assertTrue( - all([ec.state(guid) == ResourceState.FINISHED \ + all([ec.state(guid) == ResourceState.STOPPED \ for guid in apps]) ) @@ -219,8 +219,8 @@ main (void) ec.wait_finished(apps) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(server) == ResourceState.FINISHED) - self.assertTrue(ec.state(client) == ResourceState.FINISHED) + self.assertTrue(ec.state(server) == ResourceState.STOPPED) + self.assertTrue(ec.state(client) == ResourceState.STOPPED) stdout = ec.trace(client, "stdout") self.assertTrue(stdout.strip() == "HOLA") @@ -251,7 +251,7 @@ main (void) ec.wait_finished([app]) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) exitcode = ec.trace(app, "deploy_exitcode") self.assertTrue(exitcode.strip() == "0") @@ -284,7 +284,7 @@ main (void) ec.wait_finished([app]) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) ec.shutdown() diff --git a/test/resources/omf/vlc_wrong_non_critical.py b/test/resources/omf/vlc_wrong_non_critical.py index a43c23b9..42932643 100755 --- a/test/resources/omf/vlc_wrong_non_critical.py +++ b/test/resources/omf/vlc_wrong_non_critical.py @@ -410,8 +410,9 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2, self.app3]) + self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.STOPPED) self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.FAILED) + self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) self.ec.shutdown() @@ -494,10 +495,12 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2, self.app3, self.app4, self.app5, self.app6]) + self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.FAILED) + self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) + self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) self.assertEquals(self.ec.get_resource(self.app5).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.FAILED) + self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.STOPPED) self.ec.shutdown() -- 2.47.0