Merge pull request #1246 from kyuupichan/bug_fix
e20dfc unintentionally inverted portable condition
This commit is contained in:
commit
7becb28ec8
|
@ -56,9 +56,9 @@ class SimpleConfig(object):
|
|||
|
||||
# Portable wallets don't use a system config
|
||||
if self.cmdline_options.get('portable', False):
|
||||
self.system_config = read_system_config_function()
|
||||
else:
|
||||
self.system_config = {}
|
||||
else:
|
||||
self.system_config = read_system_config_function()
|
||||
|
||||
# Set self.path and read the user config
|
||||
self.user_config = {} # for self.get in electrum_path()
|
||||
|
|
|
@ -81,15 +81,14 @@ class Test_SimpleConfig(unittest.TestCase):
|
|||
def test_simple_config_system_config_ignored_if_portable(self):
|
||||
"""If electrum is started with the "portable" flag, system
|
||||
configuration is completely ignored."""
|
||||
another_path = tempfile.mkdtemp()
|
||||
fake_read_system = lambda : {"electrum_path": self.electrum_dir}
|
||||
fake_read_user = lambda _: {"electrum_path": another_path}
|
||||
fake_read_system = lambda : {"some_key": "some_value"}
|
||||
fake_read_user = lambda _: {}
|
||||
read_user_dir = lambda : self.user_dir
|
||||
config = SimpleConfig(options={"portable": True},
|
||||
read_system_config_function=fake_read_system,
|
||||
read_user_config_function=fake_read_user,
|
||||
read_user_dir_function=read_user_dir)
|
||||
self.assertEqual(another_path, config.get("electrum_path"))
|
||||
self.assertEqual(config.get("some_key"), None)
|
||||
|
||||
def test_simple_config_user_config_is_used_if_others_arent_specified(self):
|
||||
"""If no system-wide configuration and no command-line options are
|
||||
|
|
Loading…
Reference in New Issue