[Inteproxy-commits] r283 - in trunk: . test

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2010-10-13 15:21:46 +0200 (Wed, 13 Oct 2010)
New Revision: 283

Modified:
   trunk/ChangeLog
   trunk/test/test_create_rewrite_rules.py
Log:
Adapt test to delimiter change in substitution_rule in create-rewrite-rules.py
(rev280).


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-11 08:29:18 UTC (rev 282)
+++ trunk/ChangeLog	2010-10-13 13:21:46 UTC (rev 283)
@@ -1,3 +1,8 @@
+2010-10-13  Bjoern Schilberg <bjoern.schilberg at intevation.de>
+
+	*  test/test_create_rewrite_rules.py: Adapt test to delimiter change
+	  in substitution_rule in create-rewrite-rules.py (rev280).
+
 2010-10-11  Ingo Weinzierl <ingo.weinzierl at intevation.de>
 
 	* inteproxy/proxycore.py: Validate remote certificates when an ssl

Modified: trunk/test/test_create_rewrite_rules.py
===================================================================
--- trunk/test/test_create_rewrite_rules.py	2010-10-11 08:29:18 UTC (rev 282)
+++ trunk/test/test_create_rewrite_rules.py	2010-10-13 13:21:46 UTC (rev 283)
@@ -56,7 +56,7 @@
 """,
                       """\
 RewriteRule ^/demo\\.intevation\\.de\\/wms$ https:/$0?user=bob&password=secret [QSA,P]
-Substitute s-https?://(demo\\.intevation\\.de\\/wms)-http://localhost:64609/$1-
+Substitute s!https?://(demo\\.intevation\\.de\\/wms)!http://localhost:64609/$1!
 """)
 
     def test_create_rewrite_rules_wild_cards(self):
@@ -65,7 +65,7 @@
 """,
                       """\
 RewriteRule ^/[^/]*\\.intevation\\.de\\/wms\\/.*$ https:/$0?user=bob&password=secret [QSA,P]
-Substitute s-https?://([^/]*\\.intevation\\.de\\/wms\\/.*)-http://localhost:64609/$1-
+Substitute s!https?://([^/]*\\.intevation\\.de\\/wms\\/.*)!http://localhost:64609/$1!
 """)
 
     def test_create_rewrite_rules_wild_cards_special_characters(self):
@@ -74,7 +74,7 @@
 """,
                       """\
 RewriteRule ^/[^/]*\\.intevation\\.de\\/wms\\/.*$ https:/$0?user=bob&password=\\%24ec\\+ret\\%21 [QSA,P]
-Substitute s-https?://([^/]*\\.intevation\\.de\\/wms\\/.*)-http://localhost:64609/$1-
+Substitute s!https?://([^/]*\\.intevation\\.de\\/wms\\/.*)!http://localhost:64609/$1!
 """)
 
     def test_create_rewrite_rules_port(self):
@@ -83,5 +83,5 @@
 """,
                       """\
 RewriteRule ^/[^/]*\\.intevation\\.de\\:8000\\/wms\\/.*$ https:/$0?user=bob&password=secret [QSA,P]
-Substitute s-https?://([^/]*\\.intevation\\.de\\:8000\\/wms\\/.*)-http://localhost:64609/$1-
+Substitute s!https?://([^/]*\\.intevation\\.de\\:8000\\/wms\\/.*)!http://localhost:64609/$1!
 """)