adjust logout to have double confirm for ucph but only one for mig openid

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6243 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino

mig/user/selenium/migcore.py

@@ -345,11 +345,12 @@ def get_nav_link(driver, url, nav_class):
     return link
 
 
-def shared_logout(driver, url, login, passwd, callbacks={}):
+def shared_logout(driver, url, double_confirm, login, passwd, callbacks={}):
     """Logout through the shared logout navmenu entry and confirm. Optionally
     execute any provided callbacks for confirm states. The callbacks dictionary
     should contain state names bound to functions accepting driver and state
     name like do_stuff(driver, state) .
+    The double_confirm arg specifies if one or two confirm steps are needed.
     """
     status = True
     do_logout = False
@@ -380,21 +381,40 @@ def shared_logout(driver, url, login, passwd, callbacks={}):
         # print("DEBUG: click confirm elem: %s" % confirm_elem)
         confirm_elem.click()
         # Upstream OID(C) may have additional logout step
-        print("Confirm logout again")
-        try:
-            confirm_elem = driver.find_element(by_what('xpath'),
-                                               "//button[@value='Yes']")
-            # print("DEBUG: found confirm elem: %s" % confirm_elem)
-            state = 'logout-confirm-upstream'
-            if callbacks.get(state, None):
-                callbacks[state](driver, state)
-            # print("DEBUG: click confirm elem: %s" % confirm_elem)
-            confirm_elem.click()
-        except Exception as exc:
-            print("WARNING: failed in secondary logout: %s" % exc)
+        if double_confirm:
+            print("Confirm logout again")
+            try:
+                confirm_elem = driver.find_element(by_what('xpath'),
+                                                   "//button[@value='Yes']")
+                # print("DEBUG: found confirm elem: %s" % confirm_elem)
+                state = 'logout-confirm-upstream'
+                if callbacks.get(state, None):
+                    callbacks[state](driver, state)
+                # print("DEBUG: click confirm elem: %s" % confirm_elem)
+                confirm_elem.click()
+            except Exception as exc:
+                print("WARNING: failed in secondary logout: %s" % exc)
     else:
         status = False
         print("Confirm login NOT found")
 
     print("Finished logout: %s" % status)
     return status
+
+
+def mig_logout(driver, url, login, passwd, callbacks={}):
+    """Logout through the shared logout navmenu entry and confirm once. Optionally
+    execute any provided callbacks for confirm states. The callbacks dictionary
+    should contain state names bound to functions accepting driver and state
+    name like do_stuff(driver, state) .
+    """
+    return shared_logout(driver, url, False, login, passwd, callbacks)
+
+
+def ucph_logout(driver, url, login, passwd, callbacks={}):
+    """Logout through the shared logout navmenu entry and try to confirm twice.
+    Optionally execute any provided callbacks for confirm states. The callbacks
+    dictionary should contain state names bound to functions accepting driver
+    and state name like do_stuff(driver, state) .
+    """
+    return shared_logout(driver, url, True, login, passwd, callbacks)

mig/user/selenium/userguidescreens.py

@@ -56,8 +56,9 @@
 
 try:
     from mig.user.selenium.migcore import init_driver, ucph_login, mig_login, \
-        shared_twofactor, shared_logout, save_screen, scroll_to_elem, \
-        doubleclick_elem, select_item_by_index, get_nav_link, by_what
+        shared_twofactor, ucph_logout, mig_logout, save_screen, \
+        scroll_to_elem, doubleclick_elem, select_item_by_index, get_nav_link, \
+        by_what
 except ImportError:
     print("Failed to import migrid modules - missing PYTHONPATH=$MIG_ROOT?")
     exit(1)
@@ -1033,7 +1034,13 @@ def main():
                 time.sleep(1)
 
         print("Log out before exit")
-        status = shared_logout(driver, url, login, passwd, logout_calls)
+        if openid.lower() == 'ucph':
+            status = ucph_logout(driver, url, login, passwd, ucph_calls)
+        elif openid.lower() == 'mig':
+            status = mig_logout(driver, url, login, passwd, mig_calls)
+        else:
+            print("No such OpenID handler: %s" % openid)
+            status = False
 
         print("Now you can proceed using the browser or interrupt with Ctrl-C")
         while True: