Commit 85aef3d1 authored by J. Fernando Sánchez's avatar J. Fernando Sánchez
Browse files

Improved shelf tests

Refactored template tests
parent 98703910
...@@ -15,36 +15,12 @@ import subprocess ...@@ -15,36 +15,12 @@ import subprocess
import importlib import importlib
import yaml import yaml
from .. import models from .. import models, utils
from ..api import API_PARAMS from ..api import API_PARAMS
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def check_template(indict, template):
if isinstance(template, dict) and isinstance(indict, dict):
for k, v in template.items():
if k not in indict:
return '{} not in {}'.format(k, indict)
check_template(indict[k], v)
elif isinstance(template, list) and isinstance(indict, list):
if len(indict) != len(template):
raise models.Error('Different size for {} and {}'.format(indict, template))
for e in template:
found = False
for i in indict:
try:
check_template(i, e)
found = True
except models.Error as ex:
continue
if not found:
raise models.Error('{} not found in {}'.format(e, indict))
else:
if indict != template:
raise models.Error('{} and {} are different'.format(indict, template))
class Plugin(models.Plugin): class Plugin(models.Plugin):
def __init__(self, info=None): def __init__(self, info=None):
""" """
...@@ -79,7 +55,7 @@ class Plugin(models.Plugin): ...@@ -79,7 +55,7 @@ class Plugin(models.Plugin):
exp = case['expected'] exp = case['expected']
if not isinstance(exp, list): if not isinstance(exp, list):
exp = [exp] exp = [exp]
check_template(res, exp) utils.check_template(res, exp)
for r in res: for r in res:
r.validate() r.validate()
...@@ -282,6 +258,8 @@ def load_plugins(folders, loader=load_plugin): ...@@ -282,6 +258,8 @@ def load_plugins(folders, loader=load_plugin):
plugins = {} plugins = {}
for search_folder in folders: for search_folder in folders:
for root, dirnames, filenames in os.walk(search_folder): for root, dirnames, filenames in os.walk(search_folder):
# Do not look for plugins in hidden or special folders
dirnames[:] = [d for d in dirnames if d[0] not in ['.', '_']]
for filename in fnmatch.filter(filenames, '*.senpy'): for filename in fnmatch.filter(filenames, '*.senpy'):
name, plugin = loader(root, filename) name, plugin = loader(root, filename)
if plugin and name: if plugin and name:
......
from . import models
def check_template(indict, template):
if isinstance(template, dict) and isinstance(indict, dict):
for k, v in template.items():
if k not in indict:
return '{} not in {}'.format(k, indict)
check_template(indict[k], v)
elif isinstance(template, list) and isinstance(indict, list):
if len(indict) != len(template):
raise models.Error('Different size for {} and {}'.format(indict, template))
for e in template:
found = False
for i in indict:
try:
check_template(i, e)
found = True
except models.Error as ex:
continue
if not found:
raise models.Error('{} not found in {}'.format(e, indict))
else:
if indict != template:
raise models.Error('{} and {} are different'.format(indict, template))
...@@ -17,17 +17,19 @@ def parse_resp(resp): ...@@ -17,17 +17,19 @@ def parse_resp(resp):
class BlueprintsTest(TestCase): class BlueprintsTest(TestCase):
def setUp(self): @classmethod
self.app = Flask("test_extensions") def setUpClass(cls):
self.app.debug = False """Set up only once, and re-use in every individual test"""
self.client = self.app.test_client() cls.app = Flask("test_extensions")
self.senpy = Senpy() cls.app.debug = False
self.senpy.init_app(self.app) cls.client = cls.app.test_client()
self.dir = os.path.join(os.path.dirname(__file__), "..") cls.senpy = Senpy()
self.senpy.add_folder(self.dir) cls.senpy.init_app(cls.app)
self.senpy.activate_plugin("Dummy", sync=True) cls.dir = os.path.join(os.path.dirname(__file__), "..")
self.senpy.activate_plugin("DummyRequired", sync=True) cls.senpy.add_folder(cls.dir)
self.senpy.default_plugin = 'Dummy' cls.senpy.activate_plugin("Dummy", sync=True)
cls.senpy.activate_plugin("DummyRequired", sync=True)
cls.senpy.default_plugin = 'Dummy'
def assertCode(self, resp, code): def assertCode(self, resp, code):
self.assertEqual(resp.status_code, code) self.assertEqual(resp.status_code, code)
......
...@@ -33,7 +33,6 @@ class PluginsTest(TestCase): ...@@ -33,7 +33,6 @@ class PluginsTest(TestCase):
def tearDown(self): def tearDown(self):
if os.path.exists(self.shelf_dir): if os.path.exists(self.shelf_dir):
shutil.rmtree(self.shelf_dir) shutil.rmtree(self.shelf_dir)
if os.path.isfile(self.shelf_file): if os.path.isfile(self.shelf_file):
os.remove(self.shelf_file) os.remove(self.shelf_file)
...@@ -51,26 +50,29 @@ class PluginsTest(TestCase): ...@@ -51,26 +50,29 @@ class PluginsTest(TestCase):
def test_shelf(self): def test_shelf(self):
''' A shelf is created and the value is stored ''' ''' A shelf is created and the value is stored '''
newfile = self.shelf_file + "new"
a = ShelfDummyPlugin(info={ a = ShelfDummyPlugin(info={
'name': 'shelve', 'name': 'shelve',
'version': 'test', 'version': 'test',
'shelf_file': self.shelf_file 'shelf_file': newfile
}) })
assert a.sh == {} assert a.sh == {}
a.activate() a.activate()
assert a.sh == {'counter': 0} assert a.sh == {'counter': 0}
assert a.shelf_file == self.shelf_file assert a.shelf_file == newfile
a.sh['a'] = 'fromA' a.sh['a'] = 'fromA'
assert a.sh['a'] == 'fromA' assert a.sh['a'] == 'fromA'
a.save() a.save()
sh = pickle.load(open(self.shelf_file, 'rb')) sh = pickle.load(open(newfile, 'rb'))
assert sh['a'] == 'fromA' assert sh['a'] == 'fromA'
def test_dummy_shelf(self): def test_dummy_shelf(self):
with open(self.shelf_file, 'wb') as f:
pickle.dump({'counter': 99}, f)
a = ShelfDummyPlugin(info={ a = ShelfDummyPlugin(info={
'name': 'DummyShelf', 'name': 'DummyShelf',
'shelf_file': self.shelf_file, 'shelf_file': self.shelf_file,
...@@ -80,9 +82,13 @@ class PluginsTest(TestCase): ...@@ -80,9 +82,13 @@ class PluginsTest(TestCase):
assert a.shelf_file == self.shelf_file assert a.shelf_file == self.shelf_file
res1 = a.analyse(input=1) res1 = a.analyse(input=1)
assert res1.entries[0].nif__isString == 1 assert res1.entries[0].nif__isString == 100
res2 = a.analyse(input=1) a.deactivate()
assert res2.entries[0].nif__isString == 2 del a
with open(self.shelf_file, 'rb') as f:
sh = pickle.load(f)
assert sh['counter'] == 100
def test_corrupt_shelf(self): def test_corrupt_shelf(self):
''' Reusing the values of a previous shelf ''' ''' Reusing the values of a previous shelf '''
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment