balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 08:12:27 +00:00
Code Issues Releases Wiki Activity

Change data loading logic. Bugs senpy.testing

Browse Source
This commit is contained in:
J. Fernando Sánchez 2018-06-15 16:47:48 +02:00
parent 7a8abf1823
commit 6832a2816d
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
senpy/plugins/__init__.py
View File

@ -95,12 +95,22 @@ class Plugin(with_metaclass(PluginMeta, models.Plugin)):
self.id = 'plugins/{}_{}'.format(self['name'], self['version']) self.id = 'plugins/{}_{}'.format(self['name'], self['version'])
self.is_activated = False self.is_activated = False
self._lock = threading.Lock() self._lock = threading.Lock()
self.data_folder = data_folder or os.getcwd()
self._directory = os.path.abspath(os.path.dirname(inspect.getfile(self.__class__))) self._directory = os.path.abspath(os.path.dirname(inspect.getfile(self.__class__)))
self._data_paths = ['',
data_folder = data_folder or os.getcwd()
subdir = os.path.join(data_folder, self.name)
self._data_paths = [
data_folder,
subdir,
self._directory, self._directory,
os.path.join(self._directory, 'data'), os.path.join(self._directory, 'data'),
self.data_folder] ]
if os.path.exists(subdir):
data_folder = subdir
self.data_folder = data_folder
self._log = logging.getLogger('{}.{}'.format(__name__, self.name)) self._log = logging.getLogger('{}.{}'.format(__name__, self.name))
@property @property

2
senpy/plugins/sentiment/sentiment140/sentiment140.py
View File

@ -41,7 +41,7 @@ class Sentiment140Plugin(SentimentPlugin):
To avoid calling the sentiment140 API, we will mock the results To avoid calling the sentiment140 API, we will mock the results
from requests. from requests.
''' '''
from senpy.test import patch_requests from senpy.testing import patch_requests
expected = {"data": [{"polarity": 4}]} expected = {"data": [{"polarity": 4}]}
with patch_requests(expected) as (request, response): with patch_requests(expected) as (request, response):
super(Sentiment140Plugin, self).test(*args, **kwargs) super(Sentiment140Plugin, self).test(*args, **kwargs)

2
tests/test_client.py
View File

@ -1,6 +1,6 @@
from unittest import TestCase from unittest import TestCase
from senpy.test import patch_requests from senpy.testing import patch_requests
from senpy.client import Client from senpy.client import Client
from senpy.models import Results, Plugins, Error from senpy.models import Results, Plugins, Error
from senpy.plugins import AnalysisPlugin from senpy.plugins import AnalysisPlugin

2
tests/test_test.py
View File

@ -2,7 +2,7 @@ from unittest import TestCase
import requests import requests
import json import json
from senpy.test import patch_requests from senpy.testing import patch_requests
from senpy.models import Results from senpy.models import Results