Commit c38cf733 authored by juga's avatar juga
Browse files

Merge branch 'bug28724_01'

parents fcca7faf 21ce9b69

sbws/util/config.py

+5 −2
Original line number Diff line number Diff line
@@ -71,10 +71,13 @@ def _get_user_config(args, conf=None): 
            print('Configuration file %s not found, using defaults.' %

                  args.config)

            return conf

        print('Using configuration provided as argument %s' % args.config)

        return _extend_config(conf, args.config)

    user_config_path = _obtain_user_conf_path()

    if os.path.isfile(user_config_path):

        print('Using configuration file %s' % user_config_path)

        return _extend_config(conf, user_config_path)

    log.debug('No user config found.')

    log.debug('No user config found, using defaults.')

    return conf

tests/unit/util/data/user_sbws.ini

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[paths]



sbws_home = /tmp/.sbws
 
 No newline at end of file

tests/unit/util/test_config.py

+9 −1
Original line number Diff line number Diff line
@@ -237,4 +237,12 @@ def test_nickname(): 


def test_config_arg_provided_but_no_found(args, conf):

    args.config = 'non_existing_file'

    con._get_user_config(args, conf=None)
 
    user_conf = con._get_user_config(args, conf)

    # since the user configuration is not found, it is the same as conf

    assert conf.__dict__.items() == user_conf.__dict__.items()





def test_config_arg_provided(args, conf, datadir):

    args.config = datadir.join('user_sbws.ini')

    user_conf = con._get_user_config(args, conf)

    assert user_conf['paths']['sbws_home'] == '/tmp/.sbws'