Merge lp:~ara/mago/shotwell_natty into lp:~mago-contributors/mago/mago-1.0

[Ara Pulido]

Fixes the mago tests for Natty.

Shotwell crashes when importing a folder. Bug 676949

[Jean-Baptiste Lallement (jibel)]

Thanks for the update. The issue with txtLocation is fixed but there's another problem now. The test waits for a dialog named dlgInformation which is not there, then tries to use mnuSelectAll from the main window which is already closed. Backtrace below

2010-11-25 09:42:53,200 WARNING Traceback (most recent call last):
  File "/home/ubuntu/Ubuntu/QA/Tools/mago/shotwell_natty/mago/cmd/runner.py", line 39, in run
    rv = self.test_method(**self.case_data.args)
  File "./shotwell/shotwell_basics.py", line 11, in import_folder
    success = self.application.import_from_folder(import_path)
  File "/home/ubuntu/Ubuntu/QA/Tools/mago/shotwell_natty/mago/application/shotwell.py", line 109, in import_from_folder
    lblSuccess = dlgInfo.getchild(self.LBL_SUCCESSFUL)
  File "/usr/lib/pymodules/python2.6/ooldtp/_context.py", line 81, in getchild
    matches = self._remote_getchild(child_name, role)
  File "/usr/lib/pymodules/python2.6/ooldtp/_context.py", line 100, in __call__
    return self._func(self._window_name, *args, **kwargs)
  File "/usr/lib/pymodules/python2.6/ldtp/client.py", line 50, in __call__
    return self.__send(self.__name, args)
  File "/usr/lib/python2.6/xmlrpclib.py", line 1489, in __request
    verbose=self.__verbose
  File "/usr/lib/pymodules/python2.6/ldtp/client.py", line 99, in request
    raise LdtpExecutionError(e.faultString)
LdtpExecutionError: Unable to find window "dlgInformation"

2010-11-25 09:42:53,201 DEBUG imagecapture(None, 0, 0, None, None)
2010-11-25 09:42:53,715 DEBUG getchild('frmShotwell', 'mnuSelectAll', '')
2010-11-25 09:42:53,752 WARNING Traceback (most recent call last):
  File "/home/ubuntu/Ubuntu/QA/Tools/mago/shotwell_natty/mago/cmd/runner.py", line 106, in run
    self._run(loggerclass, setup_once)
  File "/home/ubuntu/Ubuntu/QA/Tools/mago/shotwell_natty/mago/cmd/runner.py", line 154, in _run
    self.suite.teardown()
  File "/home/ubuntu/Ubuntu/QA/Tools/mago/shotwell_natty/mago/test_suite/shotwell.py", line 19, in teardown
    selectall = shotwell.getchild(self.application.MNU_SELECTALL)
  File "/usr/lib/pymodules/python2.6/ooldtp/_context.py", line 81, in getchild
    matches = self._remote_getchild(child_name, role)
  File "/usr/lib/pymodules/python2.6/ooldtp/_context.py", line 100, in __call__
    return self._func(self._window_name, *args, **kwargs)
  File "/usr/lib/pymodules/python2.6/ldtp/client.py", line 50, in __call__
    return self.__send(self.__name, args)
  File "/usr/lib/python2.6/xmlrpclib.py", line 1489, in __request
    verbose=self.__verbose
  File "/usr/lib/pymodules/python2.6/ldtp/client.py", line 99, in request
    raise LdtpExecutionError(e.faultString)
LdtpExecutionError: Unable to find window "frmShotwell"

review: Needs Fixing

[Jean-Baptiste Lallement (jibel)]

okay, sorry for the noise. Shotwell crashes, so the test fails. Thanks for the fix.

review: Approve

=== modified file 'mago/application/shotwell.py'
--- mago/application/shotwell.py	2010-11-08 11:10:08 +0000
+++ mago/application/shotwell.py	2010-11-24 09:53:14 +0000
@@ -46,6 +46,7 @@
     MNU_DELETE = _("mnuMovetoTrash")
     MNU_EMPTYTRASH = _("mnuEmptyTrash")
     BTN_ONLYREMOVE = _("btnOnlyRemove")
+    TGL_TYPEFILENAME = _("tbtnTypeafilename")
     
     def __init__(self):
         Application.__init__(self)
@@ -73,6 +74,13 @@
         
         # Import the folder
         dlgImport = ooldtp.context(self.DLG_IMPORT)
+        
+        tglFileName = dlgImport.getchild(self.TGL_TYPEFILENAME)
+        
+        if tglFileName.verifytoggled() == 0:
+            tglFileName.click()
+            dlgImport.remap()
+            
         txtLocation = dlgImport.getchild(self.TXT_LOCATION)
         txtLocation.settextvalue(path)