Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:evennia/evennia

Browse source
This commit is contained in:
Griatch 2019-10-15 19:24:18 +02:00
commit bd403453d8
2 changed files with 201 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/batchprocessors.py
View file

@ -145,7 +145,7 @@ Example batch.py file
``` ```
#HEADER #HEADER
from django.config import settings from django.conf import settings
from evennia.utils import create from evennia.utils import create
from types import basetypes from types import basetypes
@ -233,7 +233,7 @@ def read_batchfile(pythonpath, file_ending=".py"):
continue continue
break break
if not text and decoderr: if not text and decoderr:
raise UnicodeDecodeError("\n".join(decoderr)) raise UnicodeDecodeError("\n".join(decoderr), bytearray(), 0, 0, '')
return text return text

199
evennia/utils/tests/test_batchprocessors.py Normal file
View file

@ -0,0 +1,199 @@
"""Tests for batchprocessors """
import codecs
from django.test import TestCase
from evennia.utils import batchprocessors, utils
import mock
import textwrap
class TestBatchprocessorErrors(TestCase):
@mock.patch.object(utils, 'pypath_to_realpath', return_value=[])
def test_read_batchfile_raises_IOError(self, _):
with self.assertRaises(IOError):
batchprocessors.read_batchfile('foopath')
@mock.patch.object(utils, 'pypath_to_realpath', return_value=['pathfoo'])
@mock.patch.object(codecs, 'open', side_effect=ValueError('decodeerr'))
@mock.patch.object(batchprocessors, '_ENCODINGS', ['fooencoding'])
def test_read_batchfile_raises_UnicodeDecodeError(self, *_):
with self.assertRaises(UnicodeDecodeError, msg='decodeerr'):
batchprocessors.read_batchfile('foopath')
class TestBatchCommandProcessor(TestCase):
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_2_commands(self, mocked_read):
mocked_read.return_value = textwrap.dedent(
r"""
@create rock
#
@set rock/desc =
A big rock. You can tell is ancient.
#
""")
commands = batchprocessors.BATCHCMD.parse_file('foopath')
self.assertEqual([
'@create rock', '@set rock/desc =\nA big rock. You can tell is ancient.'],
commands)
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_INSERT(self, mocked_read):
mocked_read.side_effect = [
textwrap.dedent(r"""
@create sky
#
#INSERT another.ev
#
@create sun
#
"""),
textwrap.dedent(r"""
@create bird
#
@create cloud
#
""")
]
commands = batchprocessors.BATCHCMD.parse_file('foopath')
self.assertEqual(
commands,
['@create sky', '@create bird', '@create cloud', '@create sun'])
self.assertEqual(mocked_read.mock_calls, [
mock.call('foopath', file_ending='.ev'),
mock.call('another.ev', file_ending='.ev')])
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_INSERT_raises_IOError(self, mocked_read):
mocked_read.side_effect = [
textwrap.dedent(r"""
@create sky
#
#INSERT x
#
@create sun
#
"""),
IOError
]
with self.assertRaises(IOError, msg='#INSERT x failed.'):
batchprocessors.BATCHCMD.parse_file('foopath')
self.assertEqual(mocked_read.mock_calls, [
mock.call('foopath', file_ending='.ev'),
mock.call('x', file_ending='.ev')])
class TestBatchCodeProcessor(TestCase):
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_one_codeblock(self, mocked_read):
mocked_read.return_value = textwrap.dedent(
r"""
print("Hello")
""")
commands = batchprocessors.BATCHCODE.parse_file('foopath')
self.assertEqual([
'# batchcode code:\n\nprint("Hello")\n'],
commands)
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_codeblocks(self, mocked_read):
mocked_read.return_value = textwrap.dedent(
r"""
#CODE
print("Hello")
#CODE
a = 1
b = [1,
2, 3]
""")
commands = batchprocessors.BATCHCODE.parse_file('foopath')
self.assertEqual([
'# batchcode code:\n\n',
'# batchcode code:\n\nprint("Hello")\n',
'# batchcode code:\n\na = 1\nb = [1,\n2, 3]\n'],
commands)
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_header_and_two_codeblock(self, mocked_read):
mocked_read.return_value = textwrap.dedent(
r"""
#HEADER
a = 100
#CODE
a += 100
#CODE
a += 100
a == 100
""")
commands = batchprocessors.BATCHCODE.parse_file('foopath')
self.assertEqual([
'# batchcode header:\n\na = 100\n\n\n# batchcode code:\n\n',
'# batchcode header:\n\na = 100\n\n\n# batchcode code:\n\na += 100\n',
'# batchcode header:\n\na = 100\n\n\n# batchcode code:\n\na += 100\na == 100\n'],
commands)
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_INSERT(self, mocked_read):
mocked_read.side_effect = [
textwrap.dedent(r"""
a = 1
#INSERT another.py
"""),
textwrap.dedent(r"""
print("Hello")
""")
]
commands = batchprocessors.BATCHCODE.parse_file('foopath')
self.assertEqual(
commands, [
'# batchcode code:\n'
'\n'
'a = 1\n'
'# batchcode insert (another.py):# batchcode code:\n'
'\n'
'print("Hello")\n'
'\n'])
self.assertEqual(mocked_read.mock_calls, [
mock.call('foopath', file_ending='.py'),
mock.call('another.py', file_ending='.py')])
@mock.patch.object(batchprocessors, 'read_batchfile')
def test_parses_INSERT_raises_IOError(self, mocked_read):
mocked_read.side_effect = [
textwrap.dedent(r"""
#INSERT x
"""),
IOError
]
with self.assertRaises(IOError, msg='#INSERT x failed.'):
batchprocessors.BATCHCODE.parse_file('foopath')
self.assertEqual(mocked_read.mock_calls, [
mock.call('foopath', file_ending='.py'),
mock.call('x', file_ending='.py')])
@mock.patch('builtins.exec')
def test_execs_codeblock(self, mocked_exec):
err = batchprocessors.BATCHCODE.code_exec(
'# batchcode code:\n\nprint("Hello")\n',
extra_environ={})
self.assertIsNone(err)
@mock.patch('builtins.exec')
def test_execs_codeblock_with_extra_environ(self, mocked_exec):
err = batchprocessors.BATCHCODE.code_exec(
'# batchcode code:\n\nprint("Hello")\n',
extra_environ={'foo': 'bar', 'baz': True})
self.assertIsNone(err)
@mock.patch('builtins.exec')
def test_execs_codeblock_raises(self, mocked_exec):
mocked_exec.side_effect = Exception
err = batchprocessors.BATCHCODE.code_exec(
'# batchcode code:\n\nprint("Hello")\nprint("Evennia")',
extra_environ={})
self.assertIsNotNone(err)