Merge lp:~mago-contributors/mago/seahorse_revert into lp:~mago-contributors/mago/mago-1.0

[Eitan Isaacson]

[Eitan Isaacson (eeejay)]

I made changes Ara suggested, specifically factor out the key removal to Application methods, this allows the optional use of these methods with the suite's teardown or cleanup methods.

[Ara Pulido (ara)]

A couple of comments:

First a syntax error: in line 23 of the diff, you wrote:
self.generated_keys.append(' ',join([full_name, email, comment]))

the comma should be a period, it is giving a syntax error.

Second, I think it would be better to keep the label names like "lblOneormoreofthedeletedkeysareprivatekeys" as constants on the top of the python module, to follow the mago process.

Thanks,
Ara.

review: Needs Fixing

[lp:~mago-contributors/mago/seahorse_revert]

94. By Eitan Isaacson on 2009-07-07

Fixed syntax error with join(). Made delete key question label a class attribute.

[Eitan Isaacson (eeejay)]

The issues you raised are fixed in the branch. Does the PGP case run for you? I am still having issues with it. That is why I missed the join() syntax error.

Please re-review.

[lp:~mago-contributors/mago/seahorse_revert]

95. By Ara Pulido on 2009-07-10

Fixed generate PGP assertion and deletion

[Ara Pulido (ara)]

I had to make a couple of changes to generate_pgp to test to make it work. But now it is up and working.

Merging it to trunk.

review: Approve

=== modified file 'mago/application/gnome.py'
--- mago/application/gnome.py	2009-06-29 18:15:55 +0000
+++ mago/application/gnome.py	2009-07-05 09:56:31 +0000
@@ -37,11 +37,12 @@
     BTN_NEWSSH_CREATE   = "Just Create Key"
     TAB_PERSONAL_KEYS   = "My Personal Keys"
     TAB_LIST            = "ptl0"
+    TBL_PERSONAL_KEYS   = "tbl0"
 
 
     def __init__(self):
         Application.__init__(self)
-
+        self.generated_keys = []
 
     def new_key(self, key_type):
         """
@@ -188,6 +189,8 @@
         except ldtp.LdtpExecutionError:
             raise ldtp.LdtpExecutionError, "The new pgp generating key dialog was not found."
 
+        # Add key name to generated key list, so we know to delete it later.
+        self.generated_keys.append('  ',join([full_name, email, comment]))
 
     def new_ssh_key(self, description, passphrase, set_up = False, computer = '', login = ''):
         """
@@ -312,10 +315,21 @@
             
         except ldtp.LdtpExecutionError:
             raise ldtp.LdtpExecutionError, "The creating key dialog was not found."
-        
+        # Add key name to generated key list, so we know to delete it later.
+        self.generated_keys.append(description)
+
         # It is too fast to grab the main window afterwards
         ldtp.wait(3)
 
+    def go_to_tab(self, tab_name):
+        """
+        Go to the specified tab.
+        """
+        seahorse = ooldtp.context(self.name)
+        page_list = seahorse.getchild(self.TAB_LIST)
+        page_list.selecttab(self.TAB_PERSONAL_KEYS)
+        
+
     def assert_exists_key(self, name, tab_name = None):
         """
         It checks that the KEY with description 'description' is
@@ -330,25 +344,48 @@
         if not tab_name:
             tab_name = self.TAB_PERSONAL_KEYS
 
-        seahorse = ooldtp.context(self.name)
+        self.go_to_tab(tab_name)
+        seahorse = ooldtp.context(self.name)
+        return bool(seahorse.doesrowexist(self.TBL_PERSONAL_KEYS, name))
+
+    def remove_key(self, key):
+        seahorse = ooldtp.context(self.name)
+
+        tbl_personal_keys = seahorse.getchild(self.TBL_PERSONAL_KEYS)
+        mnu_delete = seahorse.getchild('mnuDelete')
+        dlg_question = ooldtp.context('dlgQuestion')
+        
         try:
-
-            page_list = seahorse.getchild(self.TAB_LIST)
-            page_list.selecttab(self.TAB_PERSONAL_KEYS)
-            scroll_pane = ldtp.getobjectproperty(self.name, tab_name, 'children')
-            list_keys = ldtp.getobjectproperty(self.name, scroll_pane, 'children')
-            list_keys = list_keys.split(' ')[0]
-            list_keys = seahorse.getchild(list_keys)
-            for i in range(0, list_keys.getrowcount()):
-                current = list_keys.getcellvalue(i, 1)
-                if name in current:
-                    return True
-            
+            tbl_personal_keys.selectrow(key)
+        except ldtp.LdtpExecutionError:
+            # Doesn't exist, return False.
             return False
 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error retrieving the list of keys."
-
+        mnu_delete.selectmenuitem()
+        # General 'private key' verification.
+        dlg_question.waittillguiexist(
+            "lblOneormoreofthedeletedkeysareprivatekeys."
+            "Areyousureyouwanttoproceed?")
+        dlg_question.click('btnDelete')
+        dlg_question.waittillguinotexist(
+            "lblOneormoreofthedeletedkeysareprivatekeys."
+            "Areyousureyouwanttoproceed?")
+
+        # Specific key type verification.
+        dlg_question.waittillguiexist()
+        dlg_question.click('btnDelete')
+        dlg_question.waittillguinotexist()
+        
+        return True
+
+    def remove_keys(self, keys=None, tab_name=None):
+        self.go_to_tab(tab_name or self.TAB_PERSONAL_KEYS)
+
+        keys = keys or self.generated_keys
+
+        for key in keys:
+            self.remove_key(key)
+        
 class GEdit(Application):
     """
     GEdit manages the Gedit application.

=== modified file 'seahorse/generate_pgp.py'
--- seahorse/generate_pgp.py	2009-06-23 13:26:34 +0000
+++ seahorse/generate_pgp.py	2009-07-05 09:56:31 +0000
@@ -7,3 +7,8 @@
 
         if self.application.assert_exists_key(name) == False:
             raise AssertionError, "The key was not succesfully created."
+
+    def teardown(self):
+        self.application.remove_keys()
+        SeahorseTestSuite.teardown(self)
+

=== modified file 'seahorse/generate_ssh.py'
--- seahorse/generate_ssh.py	2009-06-23 13:26:34 +0000
+++ seahorse/generate_ssh.py	2009-07-05 09:56:31 +0000
@@ -8,3 +8,7 @@
         # Check that the key was successfully created
         if self.application.assert_exists_key(description) == False:
             raise AssertionError, "The key was not succesfully created."
+
+    def teardown(self):
+        self.application.remove_keys()
+        SeahorseTestSuite.teardown(self)