david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reorganize asserts in tests

Browse Source 
darcs-hash:20080226193645-86b55-3dea55edca4c766ccc668ab3f93ff75ab2054099.gz
This commit is contained in:
David Rousselie
2008-02-26 20:36:45 +01:00
parent 656b2b7476
commit 73f9f255d6
1 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/jcl/jabber/tests/command.py
View File

@@ -3412,6 +3412,16 @@ class JCLCommandManager_TestCase(JCLTestCase):
info_query, info_query,
"http://jabber.org/protocol/admin#restart", "http://jabber.org/protocol/admin#restart",
"execute") "execute")
self.assertFalse(self.comp.restart)
self.assertTrue(self.comp.running)
threads = threading.enumerate()
self.assertEquals(len(threads), 2)
threading.Event().wait(1)
threads = threading.enumerate()
self.assertEquals(len(threads), 1)
self.assertTrue(self.comp.restart)
self.assertFalse(self.comp.running)
self.assertNotEquals(result, None) self.assertNotEquals(result, None)
self.assertEquals(len(result), 3) self.assertEquals(len(result), 3)
xml_command = result[0].xpath_eval("c:command", xml_command = result[0].xpath_eval("c:command",
@@ -3430,6 +3440,15 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertEquals(result[2].get_from(), self.comp.jid) self.assertEquals(result[2].get_from(), self.comp.jid)
self.assertEquals(result[2].get_to(), "test2@test.com") self.assertEquals(result[2].get_to(), "test2@test.com")
self.assertEquals(result[2].get_body(), "service will be restarted in 0 second") self.assertEquals(result[2].get_body(), "service will be restarted in 0 second")
def test_execute_restart_no_announcement(self):
(submit_form, command_node, info_query,
xml_command, session_id) = self._common_execute_restart()
submit_form.as_xml(command_node)
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#restart",
"execute")
self.assertFalse(self.comp.restart) self.assertFalse(self.comp.restart)
self.assertTrue(self.comp.running) self.assertTrue(self.comp.running)
threads = threading.enumerate() threads = threading.enumerate()
@@ -3440,14 +3459,6 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertTrue(self.comp.restart) self.assertTrue(self.comp.restart)
self.assertFalse(self.comp.running) self.assertFalse(self.comp.running)
def test_execute_restart_no_announcement(self):
(submit_form, command_node, info_query,
xml_command, session_id) = self._common_execute_restart()
submit_form.as_xml(command_node)
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#restart",
"execute")
self.assertNotEquals(result, None) self.assertNotEquals(result, None)
self.assertEquals(len(result), 1) self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command", xml_command = result[0].xpath_eval("c:command",
@@ -3459,15 +3470,6 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertFalse(context_session.has_key("announcement")) self.assertFalse(context_session.has_key("announcement"))
self.assertEquals(context_session["delay"], self.assertEquals(context_session["delay"],
["0"]) ["0"])
self.assertFalse(self.comp.restart)
self.assertTrue(self.comp.running)
threads = threading.enumerate()
self.assertEquals(len(threads), 2)
threading.Event().wait(1)
threads = threading.enumerate()
self.assertEquals(len(threads), 1)
self.assertTrue(self.comp.restart)
self.assertFalse(self.comp.running)
def _common_execute_shutdown(self): def _common_execute_shutdown(self):
self.comp.account_manager.account_classes = (ExampleAccount, self.comp.account_manager.account_classes = (ExampleAccount,
@@ -3568,6 +3570,16 @@ class JCLCommandManager_TestCase(JCLTestCase):
info_query, info_query,
"http://jabber.org/protocol/admin#shutdown", "http://jabber.org/protocol/admin#shutdown",
"execute") "execute")
self.assertFalse(self.comp.restart)
self.assertTrue(self.comp.running)
threads = threading.enumerate()
self.assertEquals(len(threads), 2)
threading.Event().wait(1)
threads = threading.enumerate()
self.assertEquals(len(threads), 1)
self.assertFalse(self.comp.restart)
self.assertFalse(self.comp.running)
self.assertNotEquals(result, None) self.assertNotEquals(result, None)
self.assertEquals(len(result), 3) self.assertEquals(len(result), 3)
xml_command = result[0].xpath_eval("c:command", xml_command = result[0].xpath_eval("c:command",
@@ -3586,6 +3598,15 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertEquals(result[2].get_from(), self.comp.jid) self.assertEquals(result[2].get_from(), self.comp.jid)
self.assertEquals(result[2].get_to(), "test2@test.com") self.assertEquals(result[2].get_to(), "test2@test.com")
self.assertEquals(result[2].get_body(), "service will be shut in 0 second") self.assertEquals(result[2].get_body(), "service will be shut in 0 second")
def test_execute_shutdown_no_announcement(self):
(submit_form, command_node, info_query,
xml_command, session_id) = self._common_execute_shutdown()
submit_form.as_xml(command_node)
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#shutdown",
"execute")
self.assertFalse(self.comp.restart) self.assertFalse(self.comp.restart)
self.assertTrue(self.comp.running) self.assertTrue(self.comp.running)
threads = threading.enumerate() threads = threading.enumerate()
@@ -3596,14 +3617,6 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertFalse(self.comp.restart) self.assertFalse(self.comp.restart)
self.assertFalse(self.comp.running) self.assertFalse(self.comp.running)
def test_execute_shutdown_no_announcement(self):
(submit_form, command_node, info_query,
xml_command, session_id) = self._common_execute_shutdown()
submit_form.as_xml(command_node)
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#shutdown",
"execute")
self.assertNotEquals(result, None) self.assertNotEquals(result, None)
self.assertEquals(len(result), 1) self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command", xml_command = result[0].xpath_eval("c:command",
@@ -3615,15 +3628,6 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertFalse(context_session.has_key("announcement")) self.assertFalse(context_session.has_key("announcement"))
self.assertEquals(context_session["delay"], self.assertEquals(context_session["delay"],
["0"]) ["0"])
self.assertFalse(self.comp.restart)
self.assertTrue(self.comp.running)
threads = threading.enumerate()
self.assertEquals(len(threads), 2)
threading.Event().wait(1)
threads = threading.enumerate()
self.assertEquals(len(threads), 1)
self.assertFalse(self.comp.restart)
self.assertFalse(self.comp.running)
def test_execute_get_last_error_no_error(self): def test_execute_get_last_error_no_error(self):
self.comp.account_manager.account_classes = (Account,) self.comp.account_manager.account_classes = (Account,)