X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fomf5_vlc_normal_case.py;h=4a45716d919cfa44c0b267802cf31c4089e3bfb8;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=07962e8ec310f55c378857fad2f4cde9f215f635;hpb=741b99fe027fe6b54846a0703d26510d9b40a135;p=nepi.git diff --git a/test/resources/omf/omf5_vlc_normal_case.py b/test/resources/omf/omf5_vlc_normal_case.py index 07962e8e..4a45716d 100755 --- a/test/resources/omf/omf5_vlc_normal_case.py +++ b/test/resources/omf/omf5_vlc_normal_case.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 @@ -36,17 +35,17 @@ import unittest class OMFResourceFactoryTestCase(unittest.TestCase): def test_creation_phase(self): - self.assertEquals(OMFNode.get_rtype(), "omf::Node") - self.assertEquals(len(OMFNode._attributes), 8) + self.assertEqual(OMFNode.get_rtype(), "omf::Node") + self.assertEqual(len(OMFNode._attributes), 8) - self.assertEquals(OMFWifiInterface.get_rtype(), "omf::WifiInterface") - self.assertEquals(len(OMFWifiInterface._attributes), 12) + self.assertEqual(OMFWifiInterface.get_rtype(), "omf::WifiInterface") + self.assertEqual(len(OMFWifiInterface._attributes), 12) - self.assertEquals(OMFChannel.get_rtype(), "omf::Channel") - self.assertEquals(len(OMFChannel._attributes), 8) + self.assertEqual(OMFChannel.get_rtype(), "omf::Channel") + self.assertEqual(len(OMFChannel._attributes), 8) - self.assertEquals(OMFApplication.get_rtype(), "omf::Application") - self.assertEquals(len(OMFApplication._attributes), 14) + self.assertEqual(OMFApplication.get_rtype(), "omf::Application") + self.assertEqual(len(OMFApplication._attributes), 14) class OMFEachTestCase(unittest.TestCase): def setUp(self): @@ -114,50 +113,50 @@ class OMFEachTestCase(unittest.TestCase): self.ec.shutdown() def test_creation_and_configuration_node(self): - self.assertEquals(self.ec.get(self.node1, 'hostname'), 'omf.plexus.wlab17') - self.assertEquals(self.ec.get(self.node1, 'xmppUser'), 'nepi') - self.assertEquals(self.ec.get(self.node1, 'xmppServer'), 'xmpp-plexus.onelab.eu') - self.assertEquals(self.ec.get(self.node1, 'xmppPort'), '5222') - self.assertEquals(self.ec.get(self.node1, 'xmppPassword'), '1234') - self.assertEquals(self.ec.get(self.node1, 'version'), '5') + self.assertEqual(self.ec.get(self.node1, 'hostname'), 'omf.plexus.wlab17') + self.assertEqual(self.ec.get(self.node1, 'xmppUser'), 'nepi') + self.assertEqual(self.ec.get(self.node1, 'xmppServer'), 'xmpp-plexus.onelab.eu') + self.assertEqual(self.ec.get(self.node1, 'xmppPort'), '5222') + self.assertEqual(self.ec.get(self.node1, 'xmppPassword'), '1234') + self.assertEqual(self.ec.get(self.node1, 'version'), '5') def test_creation_and_configuration_interface(self): - self.assertEquals(self.ec.get(self.iface1, 'name'), 'wlan0') - self.assertEquals(self.ec.get(self.iface1, 'mode'), 'adhoc') - self.assertEquals(self.ec.get(self.iface1, 'hw_mode'), 'g') - self.assertEquals(self.ec.get(self.iface1, 'essid'), 'vlcexp') - self.assertEquals(self.ec.get(self.iface1, 'ip'), '10.0.0.17/24') - self.assertEquals(self.ec.get(self.iface1, 'version'), '5') + self.assertEqual(self.ec.get(self.iface1, 'name'), 'wlan0') + self.assertEqual(self.ec.get(self.iface1, 'mode'), 'adhoc') + self.assertEqual(self.ec.get(self.iface1, 'hw_mode'), 'g') + self.assertEqual(self.ec.get(self.iface1, 'essid'), 'vlcexp') + self.assertEqual(self.ec.get(self.iface1, 'ip'), '10.0.0.17/24') + self.assertEqual(self.ec.get(self.iface1, 'version'), '5') def test_creation_and_configuration_channel(self): - self.assertEquals(self.ec.get(self.channel, 'channel'), '6') - self.assertEquals(self.ec.get(self.channel, 'xmppUser'), 'nepi') - self.assertEquals(self.ec.get(self.channel, 'xmppServer'), 'xmpp-plexus.onelab.eu') - self.assertEquals(self.ec.get(self.channel, 'xmppPort'), '5222') - self.assertEquals(self.ec.get(self.channel, 'xmppPassword'), '1234') - self.assertEquals(self.ec.get(self.channel, 'version'), '5') + self.assertEqual(self.ec.get(self.channel, 'channel'), '6') + self.assertEqual(self.ec.get(self.channel, 'xmppUser'), 'nepi') + self.assertEqual(self.ec.get(self.channel, 'xmppServer'), 'xmpp-plexus.onelab.eu') + self.assertEqual(self.ec.get(self.channel, 'xmppPort'), '5222') + self.assertEqual(self.ec.get(self.channel, 'xmppPassword'), '1234') + self.assertEqual(self.ec.get(self.channel, 'version'), '5') def test_creation_and_configuration_application(self): - self.assertEquals(self.ec.get(self.app1, 'appid'), 'Vlc#1') - self.assertEquals(self.ec.get(self.app1, 'command'), "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'") - self.assertEquals(self.ec.get(self.app1, 'env'), 'DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority') - self.assertEquals(self.ec.get(self.app1, 'version'), '5') + self.assertEqual(self.ec.get(self.app1, 'appid'), 'Vlc#1') + self.assertEqual(self.ec.get(self.app1, 'command'), "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'") + self.assertEqual(self.ec.get(self.app1, 'env'), 'DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority') + self.assertEqual(self.ec.get(self.app1, 'version'), '5') def test_connection(self): - self.assertEquals(len(self.ec.get_resource(self.node1).connections), 6) - self.assertEquals(len(self.ec.get_resource(self.iface1).connections), 2) - self.assertEquals(len(self.ec.get_resource(self.channel).connections), 1) - self.assertEquals(len(self.ec.get_resource(self.app1).connections), 1) - self.assertEquals(len(self.ec.get_resource(self.app2).connections), 1) + self.assertEqual(len(self.ec.get_resource(self.node1).connections), 6) + self.assertEqual(len(self.ec.get_resource(self.iface1).connections), 2) + self.assertEqual(len(self.ec.get_resource(self.channel).connections), 1) + self.assertEqual(len(self.ec.get_resource(self.app1).connections), 1) + self.assertEqual(len(self.ec.get_resource(self.app2).connections), 1) def test_condition(self): - self.assertEquals(len(self.ec.get_resource(self.app1).conditions[ResourceAction.STOP]), 1) - self.assertEquals(len(self.ec.get_resource(self.app2).conditions[ResourceAction.START]), 1) - self.assertEquals(len(self.ec.get_resource(self.app3).conditions[ResourceAction.START]), 1) - self.assertEquals(len(self.ec.get_resource(self.app4).conditions[ResourceAction.STOP]), 1) - self.assertEquals(len(self.ec.get_resource(self.app5).conditions[ResourceAction.START]), 2) + self.assertEqual(len(self.ec.get_resource(self.app1).conditions[ResourceAction.STOP]), 1) + self.assertEqual(len(self.ec.get_resource(self.app2).conditions[ResourceAction.START]), 1) + self.assertEqual(len(self.ec.get_resource(self.app3).conditions[ResourceAction.START]), 1) + self.assertEqual(len(self.ec.get_resource(self.app4).conditions[ResourceAction.STOP]), 1) + self.assertEqual(len(self.ec.get_resource(self.app5).conditions[ResourceAction.START]), 2) class OMFVLCNormalCase(unittest.TestCase): def test_deploy(self): @@ -237,31 +236,31 @@ class OMFVLCNormalCase(unittest.TestCase): ec.wait_finished([self.app1, self.app2, self.app3,self.app4, self.app5]) - self.assertEquals(round(tdiffsec(ec.get_resource(self.app2).start_time, ec.get_resource(self.app1).start_time),0), 3.0) - self.assertEquals(round(tdiffsec(ec.get_resource(self.app3).start_time, ec.get_resource(self.app2).start_time),0), 2.0) - self.assertEquals(round(tdiffsec(ec.get_resource(self.app4).start_time, ec.get_resource(self.app3).start_time),0), 3.0) - self.assertEquals(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app3).start_time),0), 20.0) - self.assertEquals(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app1).start_time),0), 25.0) - - self.assertEquals(ec.get_resource(self.node1).state, ResourceState.STARTED) - self.assertEquals(ec.get_resource(self.iface1).state, ResourceState.STARTED) - self.assertEquals(ec.get_resource(self.channel).state, ResourceState.STARTED) - self.assertEquals(ec.get_resource(self.app1).state, ResourceState.STOPPED) - self.assertEquals(ec.get_resource(self.app2).state, ResourceState.STOPPED) - self.assertEquals(ec.get_resource(self.app3).state, ResourceState.STOPPED) - self.assertEquals(ec.get_resource(self.app4).state, ResourceState.STOPPED) - self.assertEquals(ec.get_resource(self.app5).state, ResourceState.STOPPED) + self.assertEqual(round(tdiffsec(ec.get_resource(self.app2).start_time, ec.get_resource(self.app1).start_time),0), 3.0) + self.assertEqual(round(tdiffsec(ec.get_resource(self.app3).start_time, ec.get_resource(self.app2).start_time),0), 2.0) + self.assertEqual(round(tdiffsec(ec.get_resource(self.app4).start_time, ec.get_resource(self.app3).start_time),0), 3.0) + self.assertEqual(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app3).start_time),0), 20.0) + self.assertEqual(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app1).start_time),0), 25.0) + + self.assertEqual(ec.get_resource(self.node1).state, ResourceState.STARTED) + self.assertEqual(ec.get_resource(self.iface1).state, ResourceState.STARTED) + self.assertEqual(ec.get_resource(self.channel).state, ResourceState.STARTED) + self.assertEqual(ec.get_resource(self.app1).state, ResourceState.STOPPED) + self.assertEqual(ec.get_resource(self.app2).state, ResourceState.STOPPED) + self.assertEqual(ec.get_resource(self.app3).state, ResourceState.STOPPED) + self.assertEqual(ec.get_resource(self.app4).state, ResourceState.STOPPED) + self.assertEqual(ec.get_resource(self.app5).state, ResourceState.STOPPED) ec.shutdown() - self.assertEquals(ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.app1).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.app2).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.app3).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.app4).state, ResourceState.RELEASED) - self.assertEquals(ec.get_resource(self.app5).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.app2).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.app3).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.app4).state, ResourceState.RELEASED) + self.assertEqual(ec.get_resource(self.app5).state, ResourceState.RELEASED) if __name__ == '__main__':