Merge branch 'feature/generic-wizard' into develop

The generic wizard (big) branch is now stabilised.
A bunch of refactors have gone together with this topic branch:

- client does not have any info included for default service providers.
- user has to run the first-run wizard and manually entry domain for sample provider.
- remove all remains of the older branding strategy for default provider.
- srp registration + authentication are integrated with the signup process.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/leap/gui/test_mainwindow_rc.py b/src/leap/gui/test_mainwindow_rc.py
index 88ae5854..c2fb3f78 100644
--- a/src/leap/gui/test_mainwindow_rc.py
+++ b/src/leap/gui/test_mainwindow_rc.py
@@ -1,8 +1,11 @@
 import unittest
 import hashlib
 
-import sip
-sip.setapi('QVariant', 2)
+try:
+    import sip
+    sip.setapi('QVariant', 2)
+except ValueError:
+    pass
 
 from leap.gui import mainwindow_rc
 
@@ -23,4 +26,4 @@ class MainWindowResourcesTest(unittest.TestCase):
     def test_mainwindow_resources_hash(self):
         self.assertEqual(
             hashlib.md5(mainwindow_rc.qt_resource_data).hexdigest(),
-            'd74eb99247b9d5cd2f00b2f695ca6b59')
+            'cc7f55e551df55e39c7dbedc1f7de4c2')