changeset 7385:fb493f3ed4e3

tests: fix vcs Hg helper functions get_user_name and get_user_email to actually use provided config_file Running just test_get_user_name and test_get_user_email would fail when run as: py.test kallithea/tests/vcs/test_repository.py -k test_get_user The config file was not used at all, and the tests would only pass when test_get_config_value had been run first and as an unfortunate side-effect had read the same file.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 30 Sep 2018 18:29:55 +0200
parents 618f2158562e
children e885a8efef34
files kallithea/lib/vcs/backends/hg/repository.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/vcs/backends/hg/repository.py	Sun Sep 16 21:05:06 2018 +0200
+++ b/kallithea/lib/vcs/backends/hg/repository.py	Sun Sep 30 18:29:55 2018 +0200
@@ -613,7 +613,7 @@
         :param config_file: A path to file which should be used to retrieve
           configuration from (might also be a list of file paths)
         """
-        username = self.get_config_value('ui', 'username')
+        username = self.get_config_value('ui', 'username', config_file=config_file)
         if username:
             return author_name(username)
         return None
@@ -625,7 +625,7 @@
         :param config_file: A path to file which should be used to retrieve
           configuration from (might also be a list of file paths)
         """
-        username = self.get_config_value('ui', 'username')
+        username = self.get_config_value('ui', 'username', config_file=config_file)
         if username:
             return author_email(username)
         return None