From 62bd3245b5ecdae0519d7f35da0f12d7a75f35ba Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 20 Mar 2012 12:06:44 -0400 Subject: [PATCH] Segmenting middleware tests into ``pecan.tests.middleware``. --- pecan/tests/middleware/__init__.py | 0 .../{static => middleware/static_fixtures}/self.png | Bin .../{static => middleware/static_fixtures}/text.txt | 0 pecan/tests/{ => middleware}/test_debug.py | 0 pecan/tests/middleware/test_logger.py | 0 pecan/tests/{ => middleware}/test_recursive.py | 0 pecan/tests/{ => middleware}/test_static.py | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 pecan/tests/middleware/__init__.py rename pecan/tests/{static => middleware/static_fixtures}/self.png (100%) rename pecan/tests/{static => middleware/static_fixtures}/text.txt (100%) rename pecan/tests/{ => middleware}/test_debug.py (100%) create mode 100644 pecan/tests/middleware/test_logger.py rename pecan/tests/{ => middleware}/test_recursive.py (100%) rename pecan/tests/{ => middleware}/test_static.py (83%) diff --git a/pecan/tests/middleware/__init__.py b/pecan/tests/middleware/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pecan/tests/static/self.png b/pecan/tests/middleware/static_fixtures/self.png similarity index 100% rename from pecan/tests/static/self.png rename to pecan/tests/middleware/static_fixtures/self.png diff --git a/pecan/tests/static/text.txt b/pecan/tests/middleware/static_fixtures/text.txt similarity index 100% rename from pecan/tests/static/text.txt rename to pecan/tests/middleware/static_fixtures/text.txt diff --git a/pecan/tests/test_debug.py b/pecan/tests/middleware/test_debug.py similarity index 100% rename from pecan/tests/test_debug.py rename to pecan/tests/middleware/test_debug.py diff --git a/pecan/tests/middleware/test_logger.py b/pecan/tests/middleware/test_logger.py new file mode 100644 index 0000000..e69de29 diff --git a/pecan/tests/test_recursive.py b/pecan/tests/middleware/test_recursive.py similarity index 100% rename from pecan/tests/test_recursive.py rename to pecan/tests/middleware/test_recursive.py diff --git a/pecan/tests/test_static.py b/pecan/tests/middleware/test_static.py similarity index 83% rename from pecan/tests/test_static.py rename to pecan/tests/middleware/test_static.py index 6e26ed4..ddf1b2b 100644 --- a/pecan/tests/test_static.py +++ b/pecan/tests/middleware/test_static.py @@ -36,24 +36,24 @@ class TestStaticFileMiddleware(TestCase): return None def test_file_can_be_found(self): - result = self._request('/static/text.txt') + result = self._request('/static_fixtures/text.txt') assert isinstance(result, FileWrapper) def test_no_file_found_causes_passthrough(self): - result = self._request('/static/nosuchfile.txt') + result = self._request('/static_fixtures/nosuchfile.txt') assert not isinstance(result, FileWrapper) assert result == ['Hello world!\n'] def test_mime_type_works_for_png_files(self): - self._request('/static/self.png') + self._request('/static_fixtures/self.png') assert self._get_response_header('Content-Type') == 'image/png' def test_file_can_be_closed(self): - result = self._request('/static/text.txt') + result = self._request('/static_fixtures/text.txt') assert result.close() == None def test_file_can_be_iterated_over(self): - result = self._request('/static/text.txt') + result = self._request('/static_fixtures/text.txt') assert len([x for x in result]) def test_date_dumping_on_unix_timestamps(self): @@ -62,5 +62,5 @@ class TestStaticFileMiddleware(TestCase): def test_separator_sanitization_still_finds_file(self): os.altsep = ':' - result = self._request(':static:text.txt') + result = self._request(':static_fixtures:text.txt') assert isinstance(result, FileWrapper)