[gentoo-commits] proj/council-webapp:master commit in: bot/tests/

[Petteri Räty]

commit:     98c8db34bdd0c7287ba4ffaf3f7d3f720cc01cec
Author:     Joachim Filip Ignacy Bartosik <jbartosik <AT> gmail <DOT> com>
AuthorDate: Mon Jul 25 13:20:27 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 13:21:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/council-webapp.git;a=commit;h=98c8db34

Fix failing supybot test

---
 bot/tests/run_test.py |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bot/tests/run_test.py b/bot/tests/run_test.py
index 136e135..3f84ccb 100644
--- a/bot/tests/run_test.py
+++ b/bot/tests/run_test.py
@@ -54,16 +54,21 @@ class MeetBotTest(unittest.TestCase):
         doesn't have a useful status code, so I need to parse the
         output.
         """
-        os.symlink("../MeetBot", "MeetBot")
-        os.symlink("../ircmeeting", "ircmeeting")
+
+        links_to_remove = []
+        for file in ["MeetBot", "ircmeeting"]:
+          if not os.path.exists(file):
+            os.symlink("../" + file , file)
+            links_to_remove.append(file)
+
         sys.path.insert(0, ".")
         try:
             output = os.popen("supybot-test ./MeetBot 2>&1").read()
             assert 'FAILED' not in output, "supybot-based tests failed."
             assert '\nOK\n'     in output, "supybot-based tests failed."
         finally:
-            os.unlink("MeetBot")
-            os.unlink("ircmeeting")
+            for link in links_to_remove:
+              os.unlink(link)
             del sys.path[0]
 
     trivial_contents = """