summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-12-21 13:42:40 +0200
committerKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-12-21 13:45:00 +0200
commitd0129d5d2cc486cf500b0f0f4109dd0f20b07e1f (patch)
tree2ce2b6161fa3db827dc04090269c58cb0a65c048
parent14ee1671bbeac1f433c2adcef31e61c7b07c8a3c (diff)
make test21.py pass even if there is a notification window before the test
-rwxr-xr-xtests/functional/test21.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/functional/test21.py b/tests/functional/test21.py
index ef3459b..e88c1ad 100755
--- a/tests/functional/test21.py
+++ b/tests/functional/test21.py
@@ -65,7 +65,8 @@ for l in s.splitlines():
and trans2_found and trans3_found:
print app1, 'found'
break
- elif not re.search(" no-TYPE ", l.strip()):
+ elif (not re.search(" no-TYPE ", l.strip())) and \
+ (not re.search(" NOTIFICATION ", l.strip())):
print 'FAIL: stacking order is wrong'
print 'Failed stack:\n', s
ret = 1
@@ -94,7 +95,8 @@ for l in s.splitlines():
break
elif re.search("%s " % app2, l.strip()):
print app2, 'found'
- elif not re.search(" no-TYPE ", l.strip()):
+ elif (not re.search(" no-TYPE ", l.strip())) and \
+ (not re.search(" NOTIFICATION ", l.strip())):
print 'FAIL: stacking order is wrong'
print 'Failed stack:\n', s
ret = 1