- Revision
- 16005
- Author
- john
- Date
- 2007-12-01 09:36:21 -0800 (Sat, 01 Dec 2007)
Log Message
Don't do verification on time zone fields because tinderboxes are not set to same time zone.
Improve error message
Improve error message
Modified Paths
Diff
Modified: trunk/chandler/parcels/osaf/framework/script_recording/__init__.py (16004 => 16005)
--- trunk/chandler/parcels/osaf/framework/script_recording/__init__.py 2007-12-01 02:45:03 UTC (rev 16004) +++ trunk/chandler/parcels/osaf/framework/script_recording/__init__.py 2007-12-01 17:36:21 UTC (rev 16005) @@ -100,11 +100,13 @@ "wx.EVT_TEXT_COPY", "wx.EVT_TEXT_PASTE") -# Scripts run at different times so these widgets values vary from run to run. +# Scripts run at different times, and on machines in different time zones, so these widgets +#values vary from run to run. ignoreValueCheckForWidgets = set (("EditCalendarStartDate", "EditCalendarEndDate", "EditCalendarStartTime", - "EditCalendarEndTime")) + "EditCalendarEndTime", + "EditTimeZone")) ignoreEventsToAssociatedBlocks = set (("RecordingMenuItem", "ScriptVerificationMenuItem"))
Modified: trunk/chandler/parcels/osaf/framework/script_recording/script_lib.py (16004 => 16005)
--- trunk/chandler/parcels/osaf/framework/script_recording/script_lib.py 2007-12-01 02:45:03 UTC (rev 16004) +++ trunk/chandler/parcels/osaf/framework/script_recording/script_lib.py 2007-12-01 17:36:21 UTC (rev 16005) @@ -194,7 +194,7 @@ else: assert value == lastWidgetValue,\ 'event %d -- widget %s value, "%s" doesn\'t match the value when the script was recorded: "%s"'\ - % (eventNumber, sentTo, value, lastWidgetValue) + % (eventNumber, ProcessEvent.lastSentTo, value, lastWidgetValue) # Keep track of the last widget. Use Id because widget can be deleted @@ -205,6 +205,7 @@ ProcessEvent.lastSentToWidget = None else: ProcessEvent.lastSentToWidget = sentToWidget + ProcessEvent.lastSentTo = sentTo processed = False if eventType is wx.EVT_SET_FOCUS:
Modified: trunk/chandler/tools/cats/recorded_scripts/recTestNewEvent.py (16004 => 16005)
--- trunk/chandler/tools/cats/recorded_scripts/recTestNewEvent.py 2007-12-01 02:45:03 UTC (rev 16004) +++ trunk/chandler/tools/cats/recorded_scripts/recTestNewEvent.py 2007-12-01 17:36:21 UTC (rev 16005) @@ -123,7 +123,7 @@ (119, wx.FocusEvent, {'associatedBlock':'EditTimeZone', 'eventType':wx.EVT_SET_FOCUS, 'sentTo':u'EditTimeZone'}, {}), (120, wx.MouseEvent, {'associatedBlock':'EditTimeZone', 'eventType':wx.EVT_LEFT_UP, 'sentTo':u'EditTimeZone'}, {'m_x':169, 'm_y':9}), (121, wx.MouseEvent, {'associatedBlock':'EditTimeZone', 'eventType':wx.EVT_LEFT_UP, 'sentTo':u'EditTimeZone'}, {'m_x':169, 'm_y':9}), - (122, wx.MouseEvent, {'associatedBlock':'EditRecurrence', 'eventType':wx.EVT_LEFT_DOWN, 'sentTo':u'EditRecurrence', 'recordedFocusWindow':u'EditTimeZone', 'recordedFocusWindowClass':osaf.framework.attributeEditors.AttributeEditors.AEChoice, 'lastWidgetValue':u'America/Los_Angeles'}, {'m_leftDown':True, 'm_x':68, 'm_y':8}), + (122, wx.MouseEvent, {'associatedBlock':'EditRecurrence', 'eventType':wx.EVT_LEFT_DOWN, 'sentTo':u'EditRecurrence', 'recordedFocusWindow':u'EditTimeZone', 'recordedFocusWindowClass':osaf.framework.attributeEditors.AttributeEditors.AEChoice}, {'m_leftDown':True, 'm_x':68, 'm_y':8}), (123, wx.FocusEvent, {'associatedBlock':'EditRecurrence', 'eventType':wx.EVT_SET_FOCUS, 'sentTo':u'EditRecurrence'}, {}), (124, wx.MouseEvent, {'associatedBlock':'EditRecurrence', 'eventType':wx.EVT_LEFT_UP, 'sentTo':u'EditRecurrence'}, {'m_x':68, 'm_y':8}), (125, wx.CommandEvent, {'associatedBlock':'EditRecurrence', 'eventType':wx.EVT_CHOICE, 'sentTo':u'EditRecurrence', 'selectedItem':1, 'recordedFocusWindow':u'EditRecurrence', 'recordedFocusWindowClass':osaf.framework.attributeEditors.AttributeEditors.AEChoice, 'lastWidgetValue':u'Daily'}, {}),
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
