diff options
author | Kali Kaneko <kali@leap.se> | 2015-08-28 10:59:30 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-08-28 10:59:30 -0400 |
commit | 8fa97c02b5f07f896e52d9bb272128f267af04ea (patch) | |
tree | e0ce6bbaaa48441ebcfb807a45e8753fe8432423 /src/leap/common/config/tests/test_baseconfig.py | |
parent | d272a953a01f5c601e4894a916f7b4d990a03327 (diff) | |
parent | ccecd1b3750bd10404511c33be1aaca82631a502 (diff) |
Merge tag '0.4.2' into debian/experimental
Tag leap.common version 0.4.2
Conflicts:
pkg/requirements-testing.pip
setup.cfg
src/leap/common/_version.py
src/leap/common/events/events_pb2.py
Diffstat (limited to 'src/leap/common/config/tests/test_baseconfig.py')
-rw-r--r-- | src/leap/common/config/tests/test_baseconfig.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/leap/common/config/tests/test_baseconfig.py b/src/leap/common/config/tests/test_baseconfig.py index 8bdf4d0..e17e82d 100644 --- a/src/leap/common/config/tests/test_baseconfig.py +++ b/src/leap/common/config/tests/test_baseconfig.py @@ -29,21 +29,21 @@ from mock import Mock # reduced eipconfig sample config sample_config = { "gateways": [ - { - "capabilities": { - "adblock": False, - "transport": ["openvpn"], - "user_ips": False - }, - "host": "host.dev.example.org", - }, { - "capabilities": { - "adblock": False, - "transport": ["openvpn"], - "user_ips": False - }, - "host": "host2.dev.example.org", - } + { + "capabilities": { + "adblock": False, + "transport": ["openvpn"], + "user_ips": False + }, + "host": "host.dev.example.org", + }, { + "capabilities": { + "adblock": False, + "transport": ["openvpn"], + "user_ips": False + }, + "host": "host2.dev.example.org", + } ], "default_language": "en", "languages": [ |