Permalink
Browse files

Reverting the fixes to tests, since the fix for the deletion problem …

…fixes the test issue as well
  • Loading branch information...
1 parent 3f7124c commit d4a3ba46f4c599af8b06297f6090d44ba2eb6c52 @lakshmivyas lakshmivyas committed Mar 4, 2009
Showing with 10 additions and 30 deletions.
  1. +3 −10 tests/test_htaccess.py
  2. +4 −10 tests/test_siteinfo.py
  3. +3 −10 tests/test_urls.py
View
@@ -21,19 +21,12 @@
TEST_SITE = Folder(TEST_ROOT).child_folder("test_site")
-import atexit
-
-@atexit.register
-def done():
- TEST_SITE.delete()
-
def setup_module(module):
- if not TEST_SITE.exists:
- Initializer(TEST_SITE.path).initialize(ROOT, template="default", force=True)
- setup_env(TEST_SITE.path)
+ Initializer(TEST_SITE.path).initialize(ROOT, template="default", force=True)
+ setup_env(TEST_SITE.path)
def teardown_module(module):
- pass
+ TEST_SITE.delete()
class TestHtaccess:
def test_listing_page_rewite_rule_generator(self):
View
@@ -32,18 +32,12 @@
TEST_ROOT = Folder(TEST_ROOT)
TEST_SITE = TEST_ROOT.child_folder("test_site")
-import atexit
-@atexit.register
-def done():
- TEST_SITE.delete()
-
-def setup_module(module):
- if not TEST_SITE.exists:
- Initializer(TEST_SITE.path).initialize(ROOT, force=True)
- setup_env(TEST_SITE.path)
+def setup_module(module):
+ Initializer(TEST_SITE.path).initialize(ROOT, force=True)
+ setup_env(TEST_SITE.path)
def teardown_module(module):
- pass
+ TEST_SITE.delete()
class TestFilters:
View
@@ -22,19 +22,12 @@
TEST_SITE = Folder(TEST_ROOT).child_folder("test_site")
-import atexit
-
-@atexit.register
-def done():
- TEST_SITE.delete()
-
def setup_module(module):
- if not TEST_SITE.exists:
- Initializer(TEST_SITE.path).initialize(ROOT, template="default", force=True)
- setup_env(TEST_SITE.path)
+ Initializer(TEST_SITE.path).initialize(ROOT, template="default", force=True)
+ setup_env(TEST_SITE.path)
def teardown_module(module):
- pass
+ TEST_SITE.delete()
class TestNormalUrls:
"""This is to make sure that the clean url generator hasn't interfered with

0 comments on commit d4a3ba4

Please sign in to comment.