Fix conflicts arising from the reuse_private_key branch

This commit is contained in:
Miguel Jacq 2018-01-16 15:30:36 +11:00
commit 76cf0ae107
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
14 changed files with 178 additions and 38 deletions

View file

@ -60,7 +60,11 @@ class TestSettings:
'autoupdate_timestamp': None,
'no_bridges': True,
'tor_bridges_use_obfs4': False,
'tor_bridges_use_custom_bridges': ''
'tor_bridges_use_custom_bridges': '',
'save_private_key': False,
'private_key': '',
'slug': '',
'hidservauth_string': ''
}
def test_fill_in_defaults(self, settings_obj):