LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-03 02:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

e20dfc unintentionally inverted portable condition

Browse source 
This wasn't noticed because the test was also broken.
This commit is contained in:
Neil Booth 2015-05-25 16:52:42 +09:00
parent d5f6651237
commit e63ac88c77
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/simple_config.py
View file

@ -56,9 +56,9 @@ class SimpleConfig(object):
# Portable wallets don't use a system config # Portable wallets don't use a system config
if self.cmdline_options.get('portable', False): if self.cmdline_options.get('portable', False):
self.system_config = read_system_config_function()
else:
self.system_config = {} self.system_config = {}
else:
self.system_config = read_system_config_function()
# Set self.path and read the user config # Set self.path and read the user config
self.user_config = {} # for self.get in electrum_path() self.user_config = {} # for self.get in electrum_path()

7
lib/tests/test_simple_config.py
View file

@ -62,15 +62,14 @@ class Test_SimpleConfig(unittest.TestCase):
def test_simple_config_system_config_ignored_if_portable(self): def test_simple_config_system_config_ignored_if_portable(self):
"""If electrum is started with the "portable" flag, system """If electrum is started with the "portable" flag, system
configuration is completely ignored.""" configuration is completely ignored."""
another_path = tempfile.mkdtemp() fake_read_system = lambda : {"some_key": "some_value"}
fake_read_system = lambda : {"electrum_path": self.electrum_dir} fake_read_user = lambda _: {}
fake_read_user = lambda _: {"electrum_path": another_path}
read_user_dir = lambda : self.user_dir read_user_dir = lambda : self.user_dir
config = SimpleConfig(options={"portable": True}, config = SimpleConfig(options={"portable": True},
read_system_config_function=fake_read_system, read_system_config_function=fake_read_system,
read_user_config_function=fake_read_user, read_user_config_function=fake_read_user,
read_user_dir_function=read_user_dir) 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): def test_simple_config_user_config_is_used_if_others_arent_specified(self):
"""If no system-wide configuration and no command-line options are """If no system-wide configuration and no command-line options are