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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-09-11 22:06:53 +0200 (Fri, 11 Sep 2009)
New Revision: 209

Modified:
   trunk/ChangeLog
   trunk/test/test_transcoder_map.py
Log:
* test/test_transcoder_map.py
(TestTranscoderMapNoWildcards.config_contents)
(TestTranscoderMapWithPathWildcards.config_contents)
(TestTranscoderMapWithHostWildcards.config_contents): Convert
config to new format


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-11 19:52:21 UTC (rev 208)
+++ trunk/ChangeLog	2009-09-11 20:06:53 UTC (rev 209)
@@ -1,5 +1,13 @@
 2009-09-11  Bernhard Herzog  <bh at intevation.de>
 
+	* test/test_transcoder_map.py
+	(TestTranscoderMapNoWildcards.config_contents)
+	(TestTranscoderMapWithPathWildcards.config_contents)
+	(TestTranscoderMapWithHostWildcards.config_contents): Convert
+	config to new format
+
+2009-09-11  Bernhard Herzog  <bh at intevation.de>
+
 	* demo.cfg: Update the inteproxy part to the new syntax and
 	document it.  The geobasisdaten.niedersachsen.de URLs are left in
 	the still supported old format for now.

Modified: trunk/test/test_transcoder_map.py
===================================================================
--- trunk/test/test_transcoder_map.py	2009-09-11 19:52:21 UTC (rev 208)
+++ trunk/test/test_transcoder_map.py	2009-09-11 20:06:53 UTC (rev 209)
@@ -30,15 +30,9 @@
 class TestTranscoderMapNoWildcards(TranscoderMapTest):
 
     config_contents = """\
-[inteproxy-demo.intevation.org]
-host=inteproxy-demo.intevation.org
-path=/cgi-bin/frida-wms
-class=owsproxy
-
-[example.com]
-host=example.com
-path=/foo
-class=basicauth
+[inteproxy-rules]
+urls=owsproxy://inteproxy-demo.intevation.org/cgi-bin/frida-wms
+     basicauth://example.com/foo
 """
     #
 
@@ -97,15 +91,9 @@
 class TestTranscoderMapWithPathWildcards(TranscoderMapTest):
 
     config_contents = """\
-[inteproxy-demo.intevation.org]
-host=inteproxy-demo.intevation.org
-path=/cgi-bin/*
-class=owsproxy
-
-[intevation-01]
-host=intevation.de
-path=/prefix*suffix
-class=basicauth
+[inteproxy-rules]
+urls=owsproxy://inteproxy-demo.intevation.org/cgi-bin/*
+     basicauth://intevation.de/prefix*suffix
 """
     #
 
@@ -146,15 +134,9 @@
 class TestTranscoderMapWithHostWildcards(TranscoderMapTest):
 
     config_contents = """\
-[intevation-01]
-host=*intevation.*
-path=/wms/*
-class=owsproxy
-
-[example.com-01]
-host=*.example.com
-path=*
-class=basicauth
+[inteproxy-rules]
+urls=owsproxy://*intevation.*/wms/*
+     basicauth://*.example.com/*
 """
     #