From 9cdc193c587631986e579c1ba37a8b982be01238 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 24 Jan 2013 18:47:41 +0900
Subject: all tests green again

plus:

* added soledad test requirements
* removed soledad from run_tests run (+1K tests failing)
* added option to run All tests to run_tests script
* pep8 cleanup
---
 src/leap/gui/tests/test_firstrun_providerselect.py | 8 +++++---
 src/leap/gui/tests/test_firstrun_register.py       | 4 ++--
 src/leap/gui/tests/test_firstrun_wizard.py         | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/leap/gui')

diff --git a/src/leap/gui/tests/test_firstrun_providerselect.py b/src/leap/gui/tests/test_firstrun_providerselect.py
index 976c68cd..18d89010 100644
--- a/src/leap/gui/tests/test_firstrun_providerselect.py
+++ b/src/leap/gui/tests/test_firstrun_providerselect.py
@@ -61,9 +61,11 @@ class SelectProviderPageLogicTestCase(qunittest.TestCase):
         checks = [x for x in self.page._do_checks()]
         eq(len(checks), 5)
         labels = [str(x) for (x, y), z in checks]
-        eq(labels, ['head_sentinel', 'checking domain name',
-                    'checking https connection',
-                    'fetching provider info', 'end_sentinel'])
+        eq(labels, ['head_sentinel',
+                    'Checking if it is a valid provider',
+                    'Checking for a secure connection',
+                    'Getting info from the provider',
+                    'end_sentinel'])
         progress = [y for (x, y), z in checks]
         eq(progress, [0, 20, 40, 80, 100])
 
diff --git a/src/leap/gui/tests/test_firstrun_register.py b/src/leap/gui/tests/test_firstrun_register.py
index d3be8897..9d62f808 100644
--- a/src/leap/gui/tests/test_firstrun_register.py
+++ b/src/leap/gui/tests/test_firstrun_register.py
@@ -78,7 +78,7 @@ class RegisterUserPageLogicTestCase(qunittest.TestCase):
             eq(len(checks), 3)
             labels = [str(x) for (x, y), z in checks]
             eq(labels, ['head_sentinel',
-                        'registering with provider',
+                        'Registering username',
                         'end_sentinel'])
             progress = [y for (x, y), z in checks]
             eq(progress, [0, 40, 100])
@@ -112,7 +112,7 @@ class RegisterUserPageUITestCase(qunittest.TestCase):
         self.pagename = "signup"
         pages = OrderedDict((
             (self.pagename, TestPage),
-            ('signupvalidation',
+            ('connect',
              firstrun.connect.ConnectionPage)))
         self.wizard = firstrun.wizard.FirstRunWizard(None, pages_dict=pages)
         self.page = self.wizard.page(self.wizard.get_page_index(self.pagename))
diff --git a/src/leap/gui/tests/test_firstrun_wizard.py b/src/leap/gui/tests/test_firstrun_wizard.py
index b6c34000..395604d3 100644
--- a/src/leap/gui/tests/test_firstrun_wizard.py
+++ b/src/leap/gui/tests/test_firstrun_wizard.py
@@ -113,7 +113,7 @@ class FirstRunWizardTestCase(qunittest.TestCase):
         # remember it's implemented as an ordered dict
 
         pagenames = ('intro', 'providerselection', 'login', 'providerinfo',
-                     'providersetupvalidation', 'signup', 'signupvalidation',
+                     'providersetupvalidation', 'signup', 'connect',
                      'lastpage')
         eq = self.assertEqual
         w = self.wizard
-- 
cgit v1.2.3