diff options
| author | Kali Kaneko <kali@leap.se> | 2014-04-23 08:00:20 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-04-23 08:00:20 -0500 |
| commit | f783150bd4afdb739c827a7bb2676ed6db6ba34e (patch) | |
| tree | 5823ea53c88a4a0906d31380cb448ec6af200e96 | |
| parent | deaddb4a77acfb99024c4ca2f584210e778573ce (diff) | |
| parent | bcf3c5d5928585e06c058bf1754100d078919bbd (diff) | |
Merge remote-tracking branch 'ivan-github/feature/skip-wizard-checks' into develop
| -rw-r--r-- | changes/feature_skip-wizard-checks | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/app.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/config/flags.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/wizard.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/util/leap_argparse.py | 4 |
5 files changed, 12 insertions, 1 deletions
diff --git a/changes/feature_skip-wizard-checks b/changes/feature_skip-wizard-checks new file mode 100644 index 00000000..c1eb07a4 --- /dev/null +++ b/changes/feature_skip-wizard-checks @@ -0,0 +1 @@ +- Add flag to skip provider checks in wizard (only for testing). diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py index 0a315be7..146743b5 100644 --- a/src/leap/bitmask/app.py +++ b/src/leap/bitmask/app.py @@ -214,6 +214,7 @@ def main(): flags.APP_VERSION_CHECK = opts.app_version_check flags.API_VERSION_CHECK = opts.api_version_check flags.OPENVPN_VERBOSITY = opts.openvpn_verb + flags.SKIP_WIZARD_CHECKS = opts.skip_wizard_checks flags.CA_CERT_FILE = opts.ca_cert_file diff --git a/src/leap/bitmask/config/flags.py b/src/leap/bitmask/config/flags.py index 7cc8711c..6b70659d 100644 --- a/src/leap/bitmask/config/flags.py +++ b/src/leap/bitmask/config/flags.py @@ -52,3 +52,6 @@ CA_CERT_FILE = None # OpenVPN verbosity level OPENVPN_VERBOSITY = 1 + +# Skip the checks in the wizard, use for testing purposes only! +SKIP_WIZARD_CHECKS = False diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index cc8c2624..020a58e2 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -24,6 +24,7 @@ from functools import partial from PySide import QtCore, QtGui +from leap.bitmask.config import flags from leap.bitmask.config.leapsettings import LeapSettings from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.provider import get_provider_path @@ -361,7 +362,8 @@ class Wizard(QtGui.QWizard): self.ui.lblProviderSelectStatus.setText("") self._domain = None self.button(QtGui.QWizard.NextButton).setEnabled(False) - self.page(self.SELECT_PROVIDER_PAGE).set_completed(False) + self.page(self.SELECT_PROVIDER_PAGE).set_completed( + flags.SKIP_WIZARD_CHECKS) def _reset_provider_setup(self): """ diff --git a/src/leap/bitmask/util/leap_argparse.py b/src/leap/bitmask/util/leap_argparse.py index 8aacc85d..84af4e8d 100644 --- a/src/leap/bitmask/util/leap_argparse.py +++ b/src/leap/bitmask/util/leap_argparse.py @@ -62,6 +62,10 @@ def build_parser(): parser.add_argument('-H', '--start-hidden', default=False, action="store_true", dest="start_hidden", help='Starts the application just in the taskbar.') + parser.add_argument('-S', '--skip-wizard-checks', default=False, + action="store_true", dest="skip_wizard_checks", + help='Skips the provider checks in the wizard (use ' + 'for testing purposes only).') # openvpn options parser.add_argument('--openvpn-verbosity', nargs='?', |