[Checkins] SVN: grok/trunk/src/grok/ removed JSON related tests. They now run in grokcore.json

[Souheil CHELFOUH]

Log message for revision 118158:
  removed JSON related tests. They now run in grokcore.json
  

Changed:
  D   grok/trunk/src/grok/ftests/json/
  U   grok/trunk/src/grok/ftests/test_grok_functional.py
  D   grok/trunk/src/grok/tests/json/
  U   grok/trunk/src/grok/tests/test_grok.py

-=-
Modified: grok/trunk/src/grok/ftests/test_grok_functional.py
===================================================================
--- grok/trunk/src/grok/ftests/test_grok_functional.py	2010-11-03 13:37:20 UTC (rev 118157)
+++ grok/trunk/src/grok/ftests/test_grok_functional.py	2010-11-03 13:37:30 UTC (rev 118158)
@@ -61,8 +61,7 @@
     for name in [
         'xmlrpc',
         'traversal', 'form', 'url', 'security', 'rest',
-        'catalog', 'site', 'application', 'viewlet', 'json',
-        'lifecycle']:
+        'catalog', 'site', 'application', 'viewlet', 'lifecycle']:
         suite.addTest(suiteFromPackage(name))
     return suite
 

Modified: grok/trunk/src/grok/tests/test_grok.py
===================================================================
--- grok/trunk/src/grok/tests/test_grok.py	2010-11-03 13:37:20 UTC (rev 118157)
+++ grok/trunk/src/grok/tests/test_grok.py	2010-11-03 13:37:30 UTC (rev 118158)
@@ -43,10 +43,9 @@
 def test_suite():
     suite = unittest.TestSuite()
     for name in ['adapter', 'error', 'event', 'security', 'catalog',
-                 'zcml', 'utility', 'xmlrpc', 'json', 'container',
+                 'zcml', 'utility', 'xmlrpc', 'container', 'viewlet',
                  'traversal', 'grokker', 'directive',
                  'baseclass', 'application',
-                 'viewlet',
                  'conflict']:
         suite.addTest(suiteFromPackage(name))
     return suite