diff options
| author | kali <kali@leap.se> | 2012-08-30 06:00:03 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-08-30 06:00:03 +0900 |
| commit | 396d815e318d03df4e21269aa8c3e6c0e6f7fad0 (patch) | |
| tree | 25cd95dec5a283ad0c14ac367e6135a532c1dd38 | |
| parent | b79a08b84e52871b1e1254f65ff774a6f0857608 (diff) | |
working with options only from cli
| -rw-r--r-- | src/leap/baseapp/mainwindow.py | 2 | ||||
| -rw-r--r-- | src/leap/eip/checks.py | 2 | ||||
| -rw-r--r-- | src/leap/eip/config.py | 3 | ||||
| -rw-r--r-- | src/leap/eip/tests/test_config.py | 7 |
4 files changed, 4 insertions, 10 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py index d7f4ecac..2f7a14dd 100644 --- a/src/leap/baseapp/mainwindow.py +++ b/src/leap/baseapp/mainwindow.py @@ -431,7 +431,7 @@ technolust</i>") if self.conductor.with_errors: #XXX how to wait on pkexec??? #something better that this workaround, plz!! - time.sleep(10) + time.sleep(5) print('errors. disconnect.') self.start_or_stopVPN() # is stop diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index 1db7158f..c6a7ca72 100644 --- a/src/leap/eip/checks.py +++ b/src/leap/eip/checks.py @@ -160,7 +160,7 @@ class EIPConfigChecker(object): def check_complete_eip_config(self, config=None): # TODO check for gateway if config is None: - config = self.config + config = self.eipconfig.get_config() try: 'trying assertions' assert 'provider' in config diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py index a9de60b2..70108a1d 100644 --- a/src/leap/eip/config.py +++ b/src/leap/eip/config.py @@ -163,8 +163,7 @@ def build_ovpn_options(daemon=False): opts = [] - opts.append('--mode') - opts.append('client') + opts.append('--client') opts.append('--dev') # XXX same in win? diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py index c3a8075e..87ef33ef 100644 --- a/src/leap/eip/tests/test_config.py +++ b/src/leap/eip/tests/test_config.py @@ -48,8 +48,7 @@ class EIPConfigTest(BaseLeapTest): username = self.get_username() groupname = self.get_groupname() - args.append('--mode') - args.append('client') + args.append('--client') args.append('--dev') #does this have to be tap for win?? args.append('tun') @@ -102,10 +101,6 @@ class EIPConfigTest(BaseLeapTest): 'testprovider.example.org', 'keys', 'ca', 'testprovider-ca-cert.pem')) - #args.append('--config') - #args.append(os.path.expanduser( - #'~/.config/leap/providers/%s/openvpn.conf' - #% constants.DEFAULT_TEST_PROVIDER)) return args # build command string |