Skip to content

Commit

Permalink
[IMP] connector_easypost: Update test object
Browse files Browse the repository at this point in the history
* Update `ObjDict` to object type with dict attributes. This allows me to use `getattr` without having uncatchable `KeyError` thrown at me.
* Fix `import_synchronizer` string lint
* Fix `import_synchronizer` `easy_import_data` by adding data object to correct object attribute
* Fix `import_synchronizer` Environment helper `_get_env_return_importer` not sending the UID over to `ConnectorSession`
  • Loading branch information
Ted Salmon committed Dec 12, 2016
1 parent 95a1b4a commit a7cfde9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
18 changes: 12 additions & 6 deletions connector_easypost/tests/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,19 @@ def __init__(self, cr, registry, model_name):
self.model = registry(model_name)


class ObjDict(dict):
class ObjDict(object):

def __getattr__(self, key):
try:
return super(ObjDict, self).__getattr__(key)
except AttributeError:
return self[key]
def __init__(self, **entries):
self.__dict__.update(entries)

def __getitem__(self, key):
return getattr(self, key)

def __setitem__(self, key, val):
return setattr(self, key, val)

def __repr__(self):
return str(self.__dict__)


class SetUpEasypostBase(common.TransactionCase):
Expand Down
12 changes: 6 additions & 6 deletions connector_easypost/unit/import_synchronizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ def run(self, easypost_id=None, force=False):
:returns object: The binding record we created/updated
"""
if not easypost_id and not self.easypost_record:
raise InvalidDataError('EasyPost ID must be supplied or \
easypost_record object must be filled')
raise InvalidDataError('EasyPost ID must be supplied or '
'easypost_record object must be filled')
self.easypost_id = easypost_id
if not self.easypost_record:
self.easypost_record = self._get_easypost_data()
Expand Down Expand Up @@ -317,9 +317,9 @@ def run(self, odoo_binding_id):
def _get_env_return_importer(env, model_name, backend_id):
""" Create the session from the given environment and return an
`EasypostImporter` instance """
session = ConnectorSession(env.cr, env, context=env.context)
env = get_environment(session, model_name, backend_id)
importer = env.get_connector_unit(EasypostImporter)
session = ConnectorSession(env.cr, env.uid, context=env.context)
conn_env = get_environment(session, model_name, backend_id)
importer = conn_env.get_connector_unit(EasypostImporter)
return importer


Expand Down Expand Up @@ -356,5 +356,5 @@ def easy_import_data(model_name, record, env, backend_id, force=False):
importer = _get_env_return_importer(env, model_name, backend_id)
_logger.debug('Importing EasyPost Data %s into record of type %s',
record, model_name)
importer.easypost_data = record
importer.easypost_record = record
importer.run(getattr(record, 'id', None), force=force)

0 comments on commit a7cfde9

Please sign in to comment.