diff --git a/tests/run_test.py b/tests/run_test.py index 6252d6f..5c99644 100644 --- a/tests/run_test.py +++ b/tests/run_test.py @@ -38,7 +38,7 @@ class MeetBotTest(unittest.TestCase): try: gbls = {"__name__":"__main__", "__file__":"../ircmeeting/meeting.py"} - execfile("../ircmeeting/meeting.py", gbls) + exec(compile(open("../ircmeeting/meeting.py", "rb").read(), "../ircmeeting/meeting.py", 'exec'), gbls) assert "M" in gbls, "M object not in globals: did it run?" finally: del sys.path[0] @@ -152,31 +152,31 @@ class MeetBotTest(unittest.TestCase): M = process_meeting(contents=self.all_commands_test_contents, extraConfig={'writer_map':self.full_writer_map}) results = M.save() - for name, output in results.iteritems(): - self.assert_('h6k4orkac' in output, "Topic failed for %s"%name) - self.assert_('blaoulrao' in output, "Info failed for %s"%name) - self.assert_('alrkkcao4' in output, "Idea failed for %s"%name) - self.assert_('ntoircoa5' in output, "Help failed for %s"%name) - self.assert_('http://bnatorkcao.net' in output, + for name, output in results.items(): + self.assertTrue('h6k4orkac' in output, "Topic failed for %s"%name) + self.assertTrue('blaoulrao' in output, "Info failed for %s"%name) + self.assertTrue('alrkkcao4' in output, "Idea failed for %s"%name) + self.assertTrue('ntoircoa5' in output, "Help failed for %s"%name) + self.assertTrue('http://bnatorkcao.net' in output, "Link(1) failed for %s"%name) - self.assert_('kroacaonteu' in output, "Link(2) failed for %s"%name) - self.assert_('http://jrotjkor.net' in output, + self.assertTrue('kroacaonteu' in output, "Link(2) failed for %s"%name) + self.assertTrue('http://jrotjkor.net' in output, "Link detection(1) failed for %s"%name) - self.assert_('krotroun' in output, + self.assertTrue('krotroun' in output, "Link detection(2) failed for %s"%name) - self.assert_('xrceoukrc' in output, "Action failed for %s"%name) - self.assert_('okbtrokr' in output, "Nick failed for %s"%name) + self.assertTrue('xrceoukrc' in output, "Action failed for %s"%name) + self.assertTrue('okbtrokr' in output, "Nick failed for %s"%name) # Things which should only appear or not appear in the # notes (not the logs): if 'log' not in name: - self.assert_( 'ckmorkont' not in output, + self.assertTrue( 'ckmorkont' not in output, "Undo failed for %s"%name) - self.assert_('topic_doeschange' in output, + self.assertTrue('topic_doeschange' in output, "Chair changing topic failed for %s"%name) - self.assert_('topic_doesntchange' not in output, + self.assertTrue('topic_doesntchange' not in output, "Non-chair not changing topic failed for %s"%name) - self.assert_('topic_doesnt2change' not in output, + self.assertTrue('topic_doesnt2change' not in output, "Un-chaired was able to chang topic for %s"%name) #def test_contents_test(self): @@ -274,19 +274,19 @@ class MeetBotTest(unittest.TestCase): def test_css_embed(self): extraConfig={ } results = self.M_trivial(extraConfig={}).save() - self.assert_('