[orca/570658] Get line_nav_bugzilla_search.py running w/o failures

[William Walker <wwalker src gnome org>]

commit 1d3579879ce24bc7e3f0a34b19bbe6ebb47099f8
Author: Willie Walker <william walker sun com>
Date:   Wed May 20 10:20:59 2009 -0400

    Get line_nav_bugzilla_search.py running w/o failures
---
 src/orca/speech.py                                 |    2 +-
 src/orca/speechgenerator.py                        |    3 ++-
 .../keystrokes/firefox/line_nav_bugzilla_search.py |   12 ++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/orca/speech.py b/src/orca/speech.py
index e08e9f5..1ef9630 100644
--- a/src/orca/speech.py
+++ b/src/orca/speech.py
@@ -156,7 +156,7 @@ def _speak(text, acss, interrupt):
                     extraDebug = " voice=%s" % key
                 break
     debug.println(debug.LEVEL_INFO, logLine + extraDebug)
-    log.info(logLine)
+    log.info(logLine + extraDebug)
 
     if _speechserver:
         _speechserver.speak(text, __resolveACSS(acss), interrupt)
diff --git a/src/orca/speechgenerator.py b/src/orca/speechgenerator.py
index f902c3a..483cfe5 100644
--- a/src/orca/speechgenerator.py
+++ b/src/orca/speechgenerator.py
@@ -1071,7 +1071,8 @@ class SpeechGenerator:
                 format = '%s + %s + %s' % (prefix, format, suffix)
                 args['recursing'] = True
                 firstTimeCalled = True
-                debug.println(debug.LEVEL_ALL, "getSpeech using '%s'" % format)
+                debug.println(debug.LEVEL_ALL, "getSpeech for %s using '%s'" \
+                              % (self._getRoleName(obj, **args), format))
             else:
                 firstTimeCalled = False
 
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search.py b/test/keystrokes/firefox/line_nav_bugzilla_search.py
index 86c48da..4373f15 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search.py
@@ -204,7 +204,8 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'List'",
      "     VISIBLE:  'List', cursor=0",
-     "SPEECH OUTPUT: 'UNCONFIRMED multi-select List with 8 items'"]))
+     "SPEECH OUTPUT: 'UNCONFIRMED' voice=uppercase",
+     "SPEECH OUTPUT: 'multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -220,7 +221,8 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'List'",
      "     VISIBLE:  'List', cursor=0",
-     "SPEECH OUTPUT: 'FIXED multi-select List with 12 items'"]))
+     "SPEECH OUTPUT: 'FIXED' voice=uppercase",
+     "SPEECH OUTPUT: 'multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -993,7 +995,8 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'List'",
      "     VISIBLE:  'List', cursor=0",
-     "SPEECH OUTPUT: 'FIXED multi-select List with 12 items'"]))
+     "SPEECH OUTPUT: 'FIXED' voice=uppercase",
+     "SPEECH OUTPUT: 'multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1009,7 +1012,8 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'List'",
      "     VISIBLE:  'List', cursor=0",
-     "SPEECH OUTPUT: 'UNCONFIRMED multi-select List with 8 items'"]))
+     "SPEECH OUTPUT: 'UNCONFIRMED' voice=uppercase",
+     "SPEECH OUTPUT: 'multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))