summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-12-21 13:42:40 +0200
committerAdam Endrodi <ext-adam.endrodi@nokia.com>2010-12-21 13:52:51 +0200
commit4c6db1eb7e2c0368991e3a8e73d016895e244177 (patch)
tree3dbee75aaac30a90a26bcbe6773fae7b33e553a8
parentdd4bbe0d0e29dc52de2517cc8f48554f0f4d9c6f (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