From fe1da68e1f6cdd5f4bd2821f769ca92faa299234 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 31 May 2010 07:13:45 +0000
Subject: [PATCH] Integration test: adapt to new behaviour for federation
 termination

---
 tests/integration/saml2/test_02_slo.py        |  2 ++
 .../integration/saml2/test_03_defederation.py | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/tests/integration/saml2/test_02_slo.py b/tests/integration/saml2/test_02_slo.py
index f7d68108..902ef4e7 100644
--- a/tests/integration/saml2/test_02_slo.py
+++ b/tests/integration/saml2/test_02_slo.py
@@ -46,6 +46,8 @@ url http://localhost:10002
 go http://localhost:10001
 fv 2 slo 'Single Logout'
 submit 'Single Logout'
+follow 'singleLogout'
+go http://localhost:10001/saml/singleLogoutFinish
 url http://localhost:10001
 find password
 go http://localhost:10002
diff --git a/tests/integration/saml2/test_03_defederation.py b/tests/integration/saml2/test_03_defederation.py
index 213cf868..593c4fdb 100644
--- a/tests/integration/saml2/test_03_defederation.py
+++ b/tests/integration/saml2/test_03_defederation.py
@@ -9,13 +9,18 @@ fv 1 username fred
 fv 1 password fred
 submit
 url http://localhost:10002
+notfind 'Log on'
+find 'Single Logout'
+find 'Federation Termination'
 submit fedterm-redirect
 url http://localhost:10002
 notfind 'Log on'
 find 'Single Logout'
-find 'Federation Termination'
+notfind 'Federation Termination'
 go http://localhost:10001
 find 'Local Logout'
+find 'Single Logout'
+notfind 'Federation Termination'
 ''')
 
 def test_sso_defederate_initiated_by_sp_soap():
@@ -27,11 +32,18 @@ fv 1 username fred
 fv 1 password fred
 submit
 url http://localhost:10002
+notfind 'Log on'
+find 'Single Logout'
+find 'Federation Termination'
 submit fedterm-soap
 url http://localhost:10002
 notfind 'Log on'
+find 'Single Logout'
+notfind 'Federation Termination'
 go http://localhost:10001
 find 'Local Logout'
+find 'Single Logout'
+notfind 'Federation Termination'
 ''')
 
 
@@ -48,13 +60,22 @@ submit fedterm-soap
 url http://localhost:10002
 notfind 'Log on'
 find 'Single Logout'
-find 'Federation Termination'
+notfind 'Federation Termination'
 go http://localhost:10001
+find 'Local Logout'
+find 'Single Logout'
+notfind 'Federation Termination'
 fv 2 binding SOAP
 fv 2 slo 'Single Logout'
 submit 'Single Logout'
 url http://localhost:10001
 find 'Log in'
+notfind 'Single Logout'
+notfind 'Federation termination'
+go http://localhost:10002
+find 'Log on'
+notfind 'Single Logout'
+notfind 'Federation termination'
 ''')