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

Proposed by James Tatum
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mago-contributors/mago/mago-ldtp2
Merge into: lp:~mago-contributors/mago/mago-1.0
Diff against target: 54 lines (+7/-8)
1 file modified
mago/application/main.py (+7/-8)
To merge this branch: bzr merge lp:~mago-contributors/mago/mago-ldtp2
Reviewer Review Type Date Requested Status
Nagappan Alagappan Approve
Review via email: mp+18612@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Tatum (jtatum) wrote :

Changing launcher to use args parameter required in ldtp2.

Revision history for this message
Nagappan Alagappan (nagappan) wrote :

Sorry for the inconvenience in changing some of the arguments in LDTPv2.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mago/application/main.py'
--- mago/application/main.py 2009-08-20 02:40:51 +0000
+++ mago/application/main.py 2010-02-04 15:11:18 +0000
@@ -19,7 +19,7 @@
19 """19 """
20 CLOSE_TYPE = 'menu'20 CLOSE_TYPE = 'menu'
21 CLOSE_NAME = 'mnuQuit'21 CLOSE_NAME = 'mnuQuit'
22 LAUNCHER_ARGS = ['']22 LAUNCHER_ARGS = []
23 WINDOW = ''23 WINDOW = ''
24 TOP_PANEL = 'frmTopExpandedEdgePanel'24 TOP_PANEL = 'frmTopExpandedEdgePanel'
2525
@@ -68,17 +68,16 @@
68 def open(self):68 def open(self):
69 """69 """
70 Given an application, it tries to open it.70 Given an application, it tries to open it.
71
72 """71 """
73 self._enable_a11y(True)72 self._enable_a11y(True)
74 ldtp.launchapp(self.LAUNCHER, arg=self.LAUNCHER_ARGS)73 ldtp.launchapp(self.LAUNCHER, args=self.LAUNCHER_ARGS)
75 self._enable_a11y(False)74 self._enable_a11y(False)
7675
77 ldtp.wait(2)76 ldtp.wait(2)
78 response = ldtp.waittillguiexist(self.name, '', 20)77 response = ldtp.waittillguiexist(self.name, '', 20)
79 78
80 if response == 0:79 if response == 0:
81 raise ldtp.LdtpExecutionError, "The " + self.name + " window was not found." 80 raise ldtp.LdtpExecutionError, "The " + self.name + " window was not found."
8281
83 def is_opened(self):82 def is_opened(self):
84 """83 """
@@ -88,7 +87,7 @@
8887
89 def close(self):88 def close(self):
90 """89 """
91 Given an application, it tries to close it. 90 Given an application, it tries to close it.
92 """91 """
93 try:92 try:
94 app = ooldtp.context(self.name)93 app = ooldtp.context(self.name)
@@ -111,9 +110,9 @@
111110
112 def save(self, save_menu='mnuSave'):111 def save(self, save_menu='mnuSave'):
113 """112 """
114 Given an application, it tries to save the current document. 113 Given an application, it tries to save the current document.
115 This method gives very basic functionality. Please, override this method in the subclasses for error checking.114 This method gives very basic functionality. Please, override this method in the subclasses for error checking.
116 115
117 @type save_menu: string116 @type save_menu: string
118 @param save_menu: The name of the Save menu of the application. If not mentioned the default will be used ("Save").117 @param save_menu: The name of the Save menu of the application. If not mentioned the default will be used ("Save").
119 """118 """

Subscribers

People subscribed via source and target branches

to status/vote changes: