Added filter-with option; fixed some error messages; changed protocol names0.2b70.2b60.2b50.2b40.2b30.2b20.2b1

6 files changed, 21 insertions, 16 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 0cc7d9b..d48c2d6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,7 +14,3 @@ import pkg_resources
 sys.path.insert(0, base)
 #pkg_resources.require('Paste-Deploy')
 
-# This is where applications we test go; these applications
-# are only used for testing, they aren't "real".
-sys.path.append(os.path.join(here, 'fake_packages'))
-
diff --git a/tests/fake_packages/FakeApp.egg/FakeApp.egg-info/entry_points.txt b/tests/fake_packages/FakeApp.egg/FakeApp.egg-info/entry_points.txt
index 8ecaf21..9bfc986 100644
--- a/tests/fake_packages/FakeApp.egg/FakeApp.egg-info/entry_points.txt
+++ b/tests/fake_packages/FakeApp.egg/FakeApp.egg-info/entry_points.txt
@@ -1,22 +1,22 @@
-[paste.app_factory1]
+[paste.app_factory]
 
       basic_app=fakeapp.apps:make_basic_app
       other=fakeapp.apps:make_basic_app2
       configed=fakeapp.configapps:SimpleApp.make_app
       
 
-[paste.filter_factory1]
+[paste.composit_factory]
 
-      caps=fakeapp.apps:make_cap_filter
+      remote_addr=fakeapp.apps:make_remote_addr
       
 
-[paste.composit_factory1]
+[paste.filter_app_factory]
 
-      remote_addr=fakeapp.apps:make_remote_addr
+      caps2=fakeapp.apps:CapFilter
       
 
-[paste.filter_app_factory1]
+[paste.filter_factory]
 
-      caps2=fakeapp.apps:CapFilter
+      caps=fakeapp.apps:make_cap_filter
       
 
diff --git a/tests/fake_packages/FakeApp.egg/setup.py b/tests/fake_packages/FakeApp.egg/setup.py
index febdf9f..854483e 100644
--- a/tests/fake_packages/FakeApp.egg/setup.py
+++ b/tests/fake_packages/FakeApp.egg/setup.py
@@ -5,18 +5,18 @@ setup(
     version="1.0",
     packages=find_packages(),
     entry_points={
-      'paste.app_factory1': """
+      'paste.app_factory': """
       basic_app=fakeapp.apps:make_basic_app
       other=fakeapp.apps:make_basic_app2
       configed=fakeapp.configapps:SimpleApp.make_app
       """,
-      'paste.composit_factory1': """
+      'paste.composit_factory': """
       remote_addr=fakeapp.apps:make_remote_addr
       """,
-      'paste.filter_factory1': """
+      'paste.filter_factory': """
       caps=fakeapp.apps:make_cap_filter
       """,
-      'paste.filter_app_factory1': """
+      'paste.filter_app_factory': """
       caps2=fakeapp.apps:CapFilter
       """,
       },
diff --git a/tests/sample_configs/test_config_included.ini b/tests/sample_configs/test_config_included.ini
index aa24a61..cc0da7a 100644
--- a/tests/sample_configs/test_config_included.ini
+++ b/tests/sample_configs/test_config_included.ini
@@ -4,7 +4,7 @@ def3 = c
 
 [app:main]
 # Equivalent to the egg reference, but just for kicks...
-paste.app_factory1 = fakeapp.configapps:SimpleApp.make_app
+paste.app_factory = fakeapp.configapps:SimpleApp.make_app
 set glob = orig
 bob = your uncle
 another = BAR
diff --git a/tests/sample_configs/test_filter.ini b/tests/sample_configs/test_filter.ini
index f948b97..bfad8dc 100644
--- a/tests/sample_configs/test_filter.ini
+++ b/tests/sample_configs/test_filter.ini
@@ -17,3 +17,6 @@ use = egg:FakeApp#caps2
 method_to_call = lower
 next = normal
 
+[app:inv]
+use = egg:FakeApp#basic_app
+filter-with = egg:FakeApp#caps
diff --git a/tests/test_filter.py b/tests/test_filter.py
index 5740223..6829ada 100644
--- a/tests/test_filter.py
+++ b/tests/test_filter.py
@@ -31,3 +31,9 @@ def test_pipeline2():
     assert isinstance(app, fakeapp.apps.CapFilter)
     assert app.app is fakeapp.apps.basic_app
     assert app.method_to_call == 'upper'
+
+def test_filter_app_inverted():
+    app = loadapp('config:sample_configs/test_filter.ini#inv',
+                  relative_to=here)
+    assert isinstance(app, fakeapp.apps.CapFilter)
+    assert app.app is fakeapp.apps.basic_app