Fix tests with Travis.

This commit is contained in:
Valentin Lorentz 2013-04-11 19:09:50 +02:00
parent 7a71ecb9f9
commit d13015dfb5
4 changed files with 15 additions and 1 deletions

View File

@ -11,5 +11,5 @@ install:
script:
- echo $TRAVIS_PYTHON_VERSION
- python setup.py install
- cd py3k/; supybot-test test --plugins-dir=plugins/ --exclude=plugins/PluginDownloader --exclude=plugins/ShrinkUrl
- cd py3k/; supybot-test test --plugins-dir=plugins/ --exclude=plugins/PluginDownloader --exclude=plugins/ShrinkUrl --disable-multiprocessing
- cat test-logs/messages.log

View File

@ -305,6 +305,7 @@ if __name__ == '__main__':
sys.exit(-1)
conf.allowDefaultOwner = options.allowDefaultOwner
conf.disableMultiprocessing = False
if not os.path.exists(conf.supybot.directories.log()):
os.mkdir(conf.supybot.directories.log())

View File

@ -146,8 +146,13 @@ if __name__ == '__main__':
action='append', dest='excludePlugins', default=[],
help='List of plugins you do not want --plugins-dir '
'to include.')
parser.add_option('', '--disable-multiprocessing', action='store_true',
dest='disableMultiprocessing',
help='Disables multiprocessing stuff.')
(options, args) = parser.parse_args()
conf.disableMultiprocessing = options.disableMultiprocessing
# This must go before checking for args, of course.
for pluginDir in options.pluginsDirs:
for name in glob.glob(os.path.join(pluginDir, '*')):

View File

@ -85,6 +85,14 @@ def process(f, *args, **kwargs):
function to <timeout> seconds."""
timeout = kwargs.pop('timeout', None)
if conf.disableMultiprocessing:
pn = kwargs.pop('pn', 'Unknown')
cn = kwargs.pop('cn', 'unknown')
try:
return f(*args, **kwargs)
except Exception as e:
return e
q = multiprocessing.Queue()
def newf(f, q, *args, **kwargs):
try: