changeset 824:cd3b797c8219

merged pytest2 branch into default branch
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 01 Sep 2011 00:32:23 +0200
parents a4ab4cb7614f (current diff) f022028e493d (diff)
children fdbf75ef21bf
files MoinMoin/apps/frontend/views.py MoinMoin/search/indexing.py MoinMoin/storage/_tests/test_indexing.py MoinMoin/storage/backends/indexing.py
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/conftest.py	Thu Sep 01 00:16:33 2011 +0200
+++ b/MoinMoin/conftest.py	Thu Sep 01 00:32:23 2011 +0200
@@ -119,8 +119,6 @@
         clean_backend()
         super(MoinTestFunction, self).teardown()
 
-    # Need to modify and add more stuffs
-
 
 def pytest_pycollect_makemodule(path, parent):
     return Module(path, parent=parent)
@@ -146,7 +144,7 @@
         # such items raise keyerror on test_item.destroy()
         # add the key 'uuid' to such items
         key_list = test_item.keys()
-        if not 'uuid' in key_list:
+        if 'uuid' not in key_list:
             test_item.change_metadata()
             test_item['uuid'] = 'temp_uuid'
             test_item.publish_metadata()
--- a/setup.cfg	Thu Sep 01 00:16:33 2011 +0200
+++ b/setup.cfg	Thu Sep 01 00:32:23 2011 +0200
@@ -39,3 +39,6 @@
 [compile_catalog]
 directory = MoinMoin/translations/
 
+[pytest]
+norecursedirs = .svn _build tmp* env
+minversion = 2.0