From 94587db6573189c0ef560bd8c5591bfff44dbc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20H=C3=B6nig?= Date: Sat, 17 Jun 2017 13:45:33 +0200 Subject: [PATCH] bots: Correctly set paths to bot modules for testing. --- bots_api/bots_test_lib.py | 4 ++-- bots_api/run.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bots_api/bots_test_lib.py b/bots_api/bots_test_lib.py index bac843a..0bbe33f 100644 --- a/bots_api/bots_test_lib.py +++ b/bots_api/bots_test_lib.py @@ -36,8 +36,8 @@ class BotTestCase(TestCase): # handler class. Eventually, we want bot's handler classes to # inherit from a common prototype specifying the handle_message # function. - bot_module_path = os.path.join( - current_dir, "bots", self.bot_name, self.bot_name + ".py") + bot_module_path = os.path.normpath(os.path.join( + current_dir, '..', 'bots', self.bot_name, self.bot_name + '.py')) lib_module = get_lib_module(bot_module_path) return lib_module.handler_class() diff --git a/bots_api/run.py b/bots_api/run.py index 73d8438..f6e2f5a 100755 --- a/bots_api/run.py +++ b/bots_api/run.py @@ -25,7 +25,7 @@ def get_lib_module(bots_fn): print('Please use a .py extension for library files.') sys.exit(1) base_bots_fn = os.path.basename(os.path.splitext(bots_fn)[0]) - sys.path.append(os.path.dirname(bots_fn)) + sys.path.insert(1, os.path.dirname(bots_fn)) module_name = base_bots_fn module = importlib.import_module(module_name) return module