More renaming. Hopefully fixed version number.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Contains settings that should apply to all runs of the Orca
|
||||
# Contains settings that should apply to all runs of the Cthulhu
|
||||
# test harness.
|
||||
|
||||
import cthulhu.debug
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"magTargetDisplay": ":0.0",
|
||||
"cthulhuModifierKeys": ["Caps_Lock, Shift_Lock"],
|
||||
"profile": ["Laptop", "laptop"],
|
||||
"quitOrcaNoConfirmation": true,
|
||||
"quitCthulhuNoConfirmation": true,
|
||||
"speechServerFactory": "cthulhu.speechdispatcherfactory",
|
||||
"speechServerInfo": ["Sintetizador predeterminado", "default"],
|
||||
"verbalizePunctuationStyle": 2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{"profile": ["Laptop", "laptop"],
|
||||
"keyboardLayout": 2,
|
||||
"quitOrcaNoConfirmation": true
|
||||
"quitCthulhuNoConfirmation": true
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# See http://live.gnome.org/Orca/RegressionTesting for more info.
|
||||
# See http://live.gnome.org/Cthulhu/RegressionTesting for more info.
|
||||
#
|
||||
# runall.sh can take the following optional parameters:
|
||||
#
|
||||
@@ -26,7 +26,7 @@ export PATH=$harnessDir/bin:$PATH:/usr/lib/openoffice/program
|
||||
|
||||
coverageMode=0
|
||||
profileMode=0
|
||||
runOrcaOnce=0
|
||||
runCthulhuOnce=0
|
||||
|
||||
process_cl () {
|
||||
while [ $# != 0 ]; do
|
||||
@@ -91,7 +91,7 @@ process_cl "${@}"
|
||||
|
||||
if [ "$coverageMode" -eq 1 ]
|
||||
then
|
||||
runOrcaOnce=1
|
||||
runCthulhuOnce=1
|
||||
export HARNESS_ASSERT=0
|
||||
echo generating coverage map...
|
||||
coverageDir=../coverage/`date +%Y-%m-%d_%H:%M:%S`
|
||||
@@ -105,7 +105,7 @@ fi
|
||||
|
||||
if [ "$profileMode" -eq 1 ]
|
||||
then
|
||||
runOrcaOnce=1
|
||||
runCthulhuOnce=1
|
||||
export HARNESS_ASSERT=0
|
||||
echo generating profile information...
|
||||
cp $harnessDir/user-settings.conf.in user-settings.conf
|
||||
@@ -172,7 +172,7 @@ do
|
||||
echo Running $testFile
|
||||
if [ "$found" -gt 0 ]
|
||||
then
|
||||
$harnessDir/runone.sh $testFile $application $runOrcaOnce
|
||||
$harnessDir/runone.sh $testFile $application $runCthulhuOnce
|
||||
else
|
||||
osType=`uname`
|
||||
for os in $OPERATING_SYSTEMS; do
|
||||
@@ -181,17 +181,17 @@ do
|
||||
found=1
|
||||
if [ $osType == $os ]
|
||||
then
|
||||
$harnessDir/runone.sh $testFile $runOrcaOnce
|
||||
$harnessDir/runone.sh $testFile $runCthulhuOnce
|
||||
fi
|
||||
fi
|
||||
done
|
||||
if [ "$found" -eq 0 ]
|
||||
then
|
||||
$harnessDir/runone.sh $testFile $runOrcaOnce
|
||||
$harnessDir/runone.sh $testFile $runCthulhuOnce
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$runOrcaOnce" -eq 0 ]
|
||||
if [ "$runCthulhuOnce" -eq 0 ]
|
||||
then
|
||||
# Copy the results (.cthulhu) file to the output directory.
|
||||
# This is the file that will be used for regression
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
# N.B. Orca's only use of dbus-python is this logger service which is only
|
||||
# N.B. Cthulhu's only use of dbus-python is this logger service which is only
|
||||
# used by the regression tests. It does not introduce a dependency, is not
|
||||
# encountered by end users, and will be removed in favor for pygi once bugs
|
||||
# 656325 and 656330 are resolved.
|
||||
@@ -21,15 +21,15 @@ class LoggerService(dbus.service.Object):
|
||||
self._filePrefix = filePrefix
|
||||
|
||||
DBusGMainLoop(set_as_default=True)
|
||||
busname = dbus.service.BusName('org.gnome.Orca', bus=dbus.SessionBus())
|
||||
dbus.service.Object.__init__(self, busname, '/org/gnome/Orca')
|
||||
busname = dbus.service.BusName('org.gnome.Cthulhu', bus=dbus.SessionBus())
|
||||
dbus.service.Object.__init__(self, busname, '/org/gnome/Cthulhu')
|
||||
|
||||
@dbus.service.method(dbus_interface='org.gnome.Orca.Logger', in_signature='', out_signature='')
|
||||
@dbus.service.method(dbus_interface='org.gnome.Cthulhu.Logger', in_signature='', out_signature='')
|
||||
def startRecording(self):
|
||||
for name in self._logNames:
|
||||
self._logger.clearLog(name)
|
||||
|
||||
@dbus.service.method(dbus_interface='org.gnome.Orca.Logger', in_signature='', out_signature='s')
|
||||
@dbus.service.method(dbus_interface='org.gnome.Cthulhu.Logger', in_signature='', out_signature='s')
|
||||
def stopRecording(self):
|
||||
contents = ''
|
||||
for name in self._logNames:
|
||||
|
||||
@@ -7,7 +7,7 @@ echo 'application_name is the name of the application to run'
|
||||
echo '0 = start and stop cthulhu inside this shell script'
|
||||
echo '1 = assume cthulhu is already running'
|
||||
echo " " # for a blank line
|
||||
echo 'See http://live.gnome.org/Orca/RegressionTesting for more info.'
|
||||
echo 'See http://live.gnome.org/Cthulhu/RegressionTesting for more info.'
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@ testLogger = Gio.DBusProxy.new_for_bus_sync(
|
||||
Gio.BusType.SESSION,
|
||||
Gio.DBusProxyFlags.NONE,
|
||||
None,
|
||||
'org.gnome.Orca',
|
||||
'/org/gnome/Orca',
|
||||
'org.gnome.Orca.Logger',
|
||||
'org.gnome.Cthulhu',
|
||||
'/org/gnome/Cthulhu',
|
||||
'org.gnome.Cthulhu.Logger',
|
||||
None)
|
||||
|
||||
enable_assert = \
|
||||
@@ -53,7 +53,7 @@ def setClipboardText(text):
|
||||
clipboard.set_text(text, -1)
|
||||
|
||||
class StartRecordingAction(AtomicAction):
|
||||
'''Tells Orca to log speech and braille output to a string which we
|
||||
'''Tells Cthulhu to log speech and braille output to a string which we
|
||||
can later obtain and use in an assertion (see AssertPresentationAction)'''
|
||||
|
||||
def __init__(self):
|
||||
@@ -68,13 +68,13 @@ class StartRecordingAction(AtomicAction):
|
||||
def __str__(self):
|
||||
return 'Start Recording Action'
|
||||
|
||||
def assertListEquality(rawOrcaResults, expectedList):
|
||||
'''Convert raw speech and braille output obtained from Orca into a
|
||||
def assertListEquality(rawCthulhuResults, expectedList):
|
||||
'''Convert raw speech and braille output obtained from Cthulhu into a
|
||||
list by splitting it at newline boundaries. Compare it to the
|
||||
list passed in and return the actual results if they differ.
|
||||
Otherwise, return None to indicate an equality.'''
|
||||
|
||||
results = rawOrcaResults.strip().split("\n")
|
||||
results = rawCthulhuResults.strip().split("\n")
|
||||
|
||||
# Shoot for a string comparison first.
|
||||
#
|
||||
@@ -98,7 +98,7 @@ def assertListEquality(rawOrcaResults, expectedList):
|
||||
return None
|
||||
|
||||
class AssertPresentationAction(AtomicAction):
|
||||
'''Ask Orca for the speech and braille logged since the last use
|
||||
'''Ask Cthulhu for the speech and braille logged since the last use
|
||||
of StartRecordingAction and apply an assertion predicate.'''
|
||||
|
||||
totalCount = 0
|
||||
@@ -114,7 +114,7 @@ class AssertPresentationAction(AtomicAction):
|
||||
assertionPredicate: method to compare actual results to expected
|
||||
results
|
||||
'''
|
||||
# [[[WDW: the pause is to wait for Orca to process an event.
|
||||
# [[[WDW: the pause is to wait for Cthulhu to process an event.
|
||||
# Probably should think of a better way to do this.]]]
|
||||
#
|
||||
if enable_assert:
|
||||
|
||||
Reference in New Issue
Block a user