Create ways for tests to disable meetingLocalConfig

- We have the __main__.running_tests that can disable it, for things
  running in the same python process.
- We have an environment variable MEETBOT_RUNNING_TESTS for different
  python processes.

darcs-hash:20090912031547-82ea9-2eaee7f221b6fc07e42fdd0bb04e4c11c6037154.gz

2 files changed, 5 insertions, 0 deletions

diff --git a/meeting.py b/meeting.py
index 9150c1a..88730b2 100644
--- a/meeting.py
+++ b/meeting.py
@@ -234,6 +234,10 @@ time.tzset()
 
 # load custom local configurations
 try:
+    import __main__
+    if getattr(__main__, 'running_tests', False): raise ImportError
+    if 'MEETBOT_RUNNING_TESTS' in os.environ: raise ImportError
+
     import meetingLocalConfig
     meetingLocalConfig = reload(meetingLocalConfig)
     if hasattr(meetingLocalConfig, 'Config'):
diff --git a/tests/run_test.py b/tests/run_test.py
index 9c2bb70..c503c24 100644
--- a/tests/run_test.py
+++ b/tests/run_test.py
@@ -8,6 +8,7 @@ import unittest
 import meeting
 
 running_tests = True
+os.environ['MEETBOT_RUNNING_TESTS'] = '1'
 
 class MeetBotTest(unittest.TestCase):