Funambol: finally fix testing

Escaping the ( in the regular expression cannot be done when setting
it, because running the command will parse and re-generate the command
line. That code must be made aware that ( requires special care.
This commit is contained in:
Patrick Ohly 2013-05-29 00:00:23 -07:00
parent 8725ceb13a
commit 801ed0cefc

View file

@ -247,7 +247,7 @@ class Context:
# use env.
cmd.insert(0, 'env')
cmdstr = " ".join(map(lambda x: (' ' in x or x == '') and ("'" in x and '"%s"' or "'%s'") % x or x, cmd))
cmdstr = " ".join(map(lambda x: (' ' in x or '(' in x or '\\' in x or x == '') and ("'" in x and '"%s"' or "'%s'") % x or x, cmd))
if dumpCommands:
cmdstr = "set -x; " + cmdstr
print "*** ( cd %s; export %s; %s )" % (os.getcwd(),
@ -1556,7 +1556,7 @@ class FunambolTest(SyncEvolutionTest):
"eds_event",
"eds_task",
"eds_memo" ],
"'CLIENT_TEST_SKIP="
"CLIENT_TEST_SKIP="
# server duplicates items in add<->add conflict because it
# does not check UID
"Client::Sync::eds_event::testAddBothSides,"
@ -1568,7 +1568,7 @@ class FunambolTest(SyncEvolutionTest):
# test cannot pass because we don't have CtCap info about
# the Funambol server
"Client::Sync::eds_contact::testExtensions,"
"' "
" "
"CLIENT_TEST_XML=1 "
"CLIENT_TEST_MAX_ITEMSIZE=2048 "
"CLIENT_TEST_DELAY=10 "