From a171c7d41358b02b3a1859732318bb1fde82fcd7 Mon Sep 17 00:00:00 2001 From: ianb Date: Mon, 22 Aug 2005 21:11:50 +0000 Subject: Moved test --- paste/tests/test_urlparser.py | 83 ---------------------- paste/tests/urlparser_data/__init__.py | 1 - paste/tests/urlparser_data/deep/index.html | 1 - paste/tests/urlparser_data/deep/sub/Main.txt | 1 - paste/tests/urlparser_data/find_file/index.txt | 1 - paste/tests/urlparser_data/find_file/test2.html | 1 - paste/tests/urlparser_data/hook/__init__.py | 10 --- paste/tests/urlparser_data/hook/app.py | 5 -- paste/tests/urlparser_data/hook/index.py | 4 -- paste/tests/urlparser_data/not_found/__init__.py | 1 - .../urlparser_data/not_found/recur/__init__.py | 9 --- .../urlparser_data/not_found/recur/isfound.txt | 1 - .../urlparser_data/not_found/simple/__init__.py | 3 - .../urlparser_data/not_found/simple/found.txt | 1 - .../urlparser_data/not_found/user/__init__.py | 12 ---- paste/tests/urlparser_data/not_found/user/list.py | 3 - paste/tests/urlparser_data/python/__init__.py | 1 - paste/tests/urlparser_data/python/simpleapp.py | 6 -- paste/tests/urlparser_data/python/stream.py | 7 -- paste/tests/urlparser_data/python/sub/__init__.py | 1 - paste/tests/urlparser_data/python/sub/simpleapp.py | 6 -- 21 files changed, 158 deletions(-) delete mode 100644 paste/tests/test_urlparser.py delete mode 100644 paste/tests/urlparser_data/__init__.py delete mode 100644 paste/tests/urlparser_data/deep/index.html delete mode 100644 paste/tests/urlparser_data/deep/sub/Main.txt delete mode 100644 paste/tests/urlparser_data/find_file/index.txt delete mode 100644 paste/tests/urlparser_data/find_file/test2.html delete mode 100644 paste/tests/urlparser_data/hook/__init__.py delete mode 100644 paste/tests/urlparser_data/hook/app.py delete mode 100644 paste/tests/urlparser_data/hook/index.py delete mode 100644 paste/tests/urlparser_data/not_found/__init__.py delete mode 100644 paste/tests/urlparser_data/not_found/recur/__init__.py delete mode 100644 paste/tests/urlparser_data/not_found/recur/isfound.txt delete mode 100644 paste/tests/urlparser_data/not_found/simple/__init__.py delete mode 100644 paste/tests/urlparser_data/not_found/simple/found.txt delete mode 100644 paste/tests/urlparser_data/not_found/user/__init__.py delete mode 100644 paste/tests/urlparser_data/not_found/user/list.py delete mode 100644 paste/tests/urlparser_data/python/__init__.py delete mode 100644 paste/tests/urlparser_data/python/simpleapp.py delete mode 100644 paste/tests/urlparser_data/python/stream.py delete mode 100644 paste/tests/urlparser_data/python/sub/__init__.py delete mode 100644 paste/tests/urlparser_data/python/sub/simpleapp.py (limited to 'paste/tests') diff --git a/paste/tests/test_urlparser.py b/paste/tests/test_urlparser.py deleted file mode 100644 index 0e1aa1a..0000000 --- a/paste/tests/test_urlparser.py +++ /dev/null @@ -1,83 +0,0 @@ -import os -from paste.urlparser import * -from fixture import fake_request - -def path(name): - return os.path.join(os.path.dirname(os.path.abspath(__file__)), - 'urlparser_data', name) - -def make_parser(name): - return URLParser(path(name), name, {'index_names': ['index', 'Main']}) - -def test_find_file(): - p = make_parser('find_file') - res = fake_request(p, '/') - assert 'index1' in res - assert res.header('content-type') == 'text/plain' - res = fake_request(p, '/index') - assert 'index1' in res - assert res.header('content-type') == 'text/plain' - res = fake_request(p, '/index.txt') - assert 'index1' in res - assert res.header('content-type') == 'text/plain' - res = fake_request(p, '/test2.html') - assert 'test2' in res - assert res.header('content-type') == 'text/html' - -def test_deep(): - p = make_parser('deep') - res = fake_request(p, '/') - assert 'index2' in res - res = fake_request(p, '/sub') - assert res.status_int == 301 - print res - assert res.header('location') == 'http://localhost/sub/' - assert 'href="http://localhost/sub/"' in res - res = fake_request(p, '/sub/') - assert 'index3' in res - -def test_python(): - p = make_parser('python') - res = fake_request(p, '/simpleapp') - res.all_ok() - assert 'test1' in res - assert res.header('test-header') == 'TEST!' - assert res.header('content-type') == 'text/html' - res = fake_request(p, '/stream') - res.all_ok() - assert 'test2' in res - res = fake_request(p, '/sub/simpleapp') - res.all_ok() - assert 'subsimple' in res - -def test_hook(): - p = make_parser('hook') - res = fake_request(p, '/bob/app') - res.all_ok() - assert 'user: bob' in res - res = fake_request(p, '/tim/') - res.all_ok() - assert 'index: tim' in res - -def test_not_found_hook(): - p = make_parser('not_found') - res = fake_request(p, '/simple/notfound') - assert res.status_int == 200 - assert 'not found' in res - res = fake_request(p, '/simple/found') - res.all_ok() - assert 'is found' in res - res = fake_request(p, '/recur/__notfound') - assert res.status_int == 404 - # @@: It's unfortunate that the original path doesn't actually show up - assert '/recur/notfound' in res - res = fake_request(p, '/recur/__isfound') - assert res.status_int == 200 - assert 'is found' in res - res = fake_request(p, '/user/list') - res.all_ok() - assert 'user: None' in res - res = fake_request(p, '/user/bob/list') - assert res.status_int == 200 - assert 'user: bob' in res - diff --git a/paste/tests/urlparser_data/__init__.py b/paste/tests/urlparser_data/__init__.py deleted file mode 100644 index 792d600..0000000 --- a/paste/tests/urlparser_data/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/paste/tests/urlparser_data/deep/index.html b/paste/tests/urlparser_data/deep/index.html deleted file mode 100644 index 8913442..0000000 --- a/paste/tests/urlparser_data/deep/index.html +++ /dev/null @@ -1 +0,0 @@ -index2 diff --git a/paste/tests/urlparser_data/deep/sub/Main.txt b/paste/tests/urlparser_data/deep/sub/Main.txt deleted file mode 100644 index ec42756..0000000 --- a/paste/tests/urlparser_data/deep/sub/Main.txt +++ /dev/null @@ -1 +0,0 @@ -index3 diff --git a/paste/tests/urlparser_data/find_file/index.txt b/paste/tests/urlparser_data/find_file/index.txt deleted file mode 100644 index 6be29bc..0000000 --- a/paste/tests/urlparser_data/find_file/index.txt +++ /dev/null @@ -1 +0,0 @@ -index1 diff --git a/paste/tests/urlparser_data/find_file/test2.html b/paste/tests/urlparser_data/find_file/test2.html deleted file mode 100644 index 180cf83..0000000 --- a/paste/tests/urlparser_data/find_file/test2.html +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/paste/tests/urlparser_data/hook/__init__.py b/paste/tests/urlparser_data/hook/__init__.py deleted file mode 100644 index 9b1055c..0000000 --- a/paste/tests/urlparser_data/hook/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -from paste import wsgilib - -def urlparser_hook(environ): - first, rest = wsgilib.path_info_split(environ.get('PATH_INFO', '')) - if not first: - # No username - return - environ['app.user'] = first - environ['SCRIPT_NAME'] += '/' + first - environ['PATH_INFO'] = rest diff --git a/paste/tests/urlparser_data/hook/app.py b/paste/tests/urlparser_data/hook/app.py deleted file mode 100644 index d2714e5..0000000 --- a/paste/tests/urlparser_data/hook/app.py +++ /dev/null @@ -1,5 +0,0 @@ -def application(environ, start_response): - start_response('200 OK', [('Content-type', 'text/html')]) - return ['user: %s' % environ['app.user']] - - diff --git a/paste/tests/urlparser_data/hook/index.py b/paste/tests/urlparser_data/hook/index.py deleted file mode 100644 index 49e89f0..0000000 --- a/paste/tests/urlparser_data/hook/index.py +++ /dev/null @@ -1,4 +0,0 @@ -def application(environ, start_response): - start_response('200 OK', [('Content-type', 'text/html')]) - return ['index: %s' % environ['app.user']] - diff --git a/paste/tests/urlparser_data/not_found/__init__.py b/paste/tests/urlparser_data/not_found/__init__.py deleted file mode 100644 index 792d600..0000000 --- a/paste/tests/urlparser_data/not_found/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/paste/tests/urlparser_data/not_found/recur/__init__.py b/paste/tests/urlparser_data/not_found/recur/__init__.py deleted file mode 100644 index 48205a5..0000000 --- a/paste/tests/urlparser_data/not_found/recur/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -def not_found_hook(environ, start_response): - urlparser = environ['paste.urlparser.not_found_parser'] - path = environ.get('PATH_INFO', '') - if not path: - return urlparser.not_found(environ, start_response) - # Strip off leading _'s - path = '/' + path.lstrip('/').lstrip('_') - environ['PATH_INFO'] = path - return urlparser(environ, start_response) diff --git a/paste/tests/urlparser_data/not_found/recur/isfound.txt b/paste/tests/urlparser_data/not_found/recur/isfound.txt deleted file mode 100644 index c8b8fab..0000000 --- a/paste/tests/urlparser_data/not_found/recur/isfound.txt +++ /dev/null @@ -1 +0,0 @@ -is found diff --git a/paste/tests/urlparser_data/not_found/simple/__init__.py b/paste/tests/urlparser_data/not_found/simple/__init__.py deleted file mode 100644 index f1e7faa..0000000 --- a/paste/tests/urlparser_data/not_found/simple/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -def not_found_hook(environ, start_response): - start_response('200 OK', [('Content-type', 'text/plain')]) - return ['not found'] diff --git a/paste/tests/urlparser_data/not_found/simple/found.txt b/paste/tests/urlparser_data/not_found/simple/found.txt deleted file mode 100644 index c8b8fab..0000000 --- a/paste/tests/urlparser_data/not_found/simple/found.txt +++ /dev/null @@ -1 +0,0 @@ -is found diff --git a/paste/tests/urlparser_data/not_found/user/__init__.py b/paste/tests/urlparser_data/not_found/user/__init__.py deleted file mode 100644 index c47f88e..0000000 --- a/paste/tests/urlparser_data/not_found/user/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from paste import wsgilib - -def not_found_hook(environ, start_response): - urlparser = environ['paste.urlparser.not_found_parser'] - first, rest = wsgilib.path_info_split(environ.get('PATH_INFO', '')) - if not first: - # No username - return - environ['app.user'] = first - environ['SCRIPT_NAME'] += '/' + first - environ['PATH_INFO'] = rest - return urlparser(environ, start_response) diff --git a/paste/tests/urlparser_data/not_found/user/list.py b/paste/tests/urlparser_data/not_found/user/list.py deleted file mode 100644 index f6228f0..0000000 --- a/paste/tests/urlparser_data/not_found/user/list.py +++ /dev/null @@ -1,3 +0,0 @@ -def application(environ, start_response): - start_response('200 OK', [('Content-type', 'text/plain')]) - return ['user: %s' % environ.get('app.user')] diff --git a/paste/tests/urlparser_data/python/__init__.py b/paste/tests/urlparser_data/python/__init__.py deleted file mode 100644 index 792d600..0000000 --- a/paste/tests/urlparser_data/python/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/paste/tests/urlparser_data/python/simpleapp.py b/paste/tests/urlparser_data/python/simpleapp.py deleted file mode 100644 index cbef9f1..0000000 --- a/paste/tests/urlparser_data/python/simpleapp.py +++ /dev/null @@ -1,6 +0,0 @@ -def application(environ, start_response): - start_response('200 OK', [('Content-type', 'text/html'), - ('test-header', 'TEST!')]) - return ['test1'] - - diff --git a/paste/tests/urlparser_data/python/stream.py b/paste/tests/urlparser_data/python/stream.py deleted file mode 100644 index 121b4d1..0000000 --- a/paste/tests/urlparser_data/python/stream.py +++ /dev/null @@ -1,7 +0,0 @@ -def stream(): - def app(environ, start_response): - writer = start_response('200 OK', [('Content-type', 'text/html')]) - writer('te') - writer('st') - return ['2'] - return app diff --git a/paste/tests/urlparser_data/python/sub/__init__.py b/paste/tests/urlparser_data/python/sub/__init__.py deleted file mode 100644 index 792d600..0000000 --- a/paste/tests/urlparser_data/python/sub/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/paste/tests/urlparser_data/python/sub/simpleapp.py b/paste/tests/urlparser_data/python/sub/simpleapp.py deleted file mode 100644 index fd90966..0000000 --- a/paste/tests/urlparser_data/python/sub/simpleapp.py +++ /dev/null @@ -1,6 +0,0 @@ -def application(environ, start_response): - start_response('200 OK', [('Content-type', 'text/html'), - ('test-header', 'TEST!')]) - return ['subsimple'] - - -- cgit v1.2.1