[Checkins] SVN: Sandbox/darrylcousins/tfws.website/ Update

Darryl Cousins darryl at darrylcousins.net.nz
Sun Feb 3 22:35:58 EST 2008


Log message for revision 83487:
  Update

Changed:
  U   Sandbox/darrylcousins/tfws.website/buildout.cfg
  U   Sandbox/darrylcousins/tfws.website/setup.py
  U   Sandbox/darrylcousins/tfws.website/src/tfws/website/ftests/test_functional.py
  U   Sandbox/darrylcousins/tfws.website/src/tfws/website/selenium.txt

-=-
Modified: Sandbox/darrylcousins/tfws.website/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/tfws.website/buildout.cfg	2008-02-04 03:32:51 UTC (rev 83486)
+++ Sandbox/darrylcousins/tfws.website/buildout.cfg	2008-02-04 03:35:58 UTC (rev 83487)
@@ -1,32 +1,40 @@
 [buildout]
-develop = . z3c.authentication z3c.resource zc.selenium
-parts = app test
-find-links = http://download.zope.org/distribution/
-eggs-directory = /opt/buildout/mars/eggs
-develop-eggs-directory = /opt/buildout/mars/develop-eggs
-extends = http://grok.zope.org/releaseinfo/grok-0.10.2.cfg
+develop = . 
+    z3c.authentication 
+    z3c.resource 
+    zc.selenium
+parts = 
+    app 
+    test
+extends = http://grok.zope.org/releaseinfo/grok-0.11.1.cfg
 versions = versions
-executable = /opt/sandbox/mars/bin/python2.4
 
 [versions]
-zope.securitypolicy = 3.4.0
-zope.app.securitypolicy = 3.4.3
+martian = 0.9.2
 
 [app]
 recipe = zc.recipe.egg
-eggs = tfws.website
-       Paste
-       PasteScript
-       PasteDeploy
-       z3c.authentication
-       z3c.resource
-       zc.selenium
+eggs = 
+    tfws.website
+    Paste
+    PasteScript
+    PasteDeploy
+    z3c.authentication
+    z3c.resource
+    zc.selenium
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = tfws.website
-       z3c.authentication
-       z3c.resource
-       zc.selenium
-defaults = ['--tests-pattern', '^f?tests$', '-v']
+eggs = 
+    tfws.website
+    z3c.authentication
+    z3c.resource
+    zc.selenium
+defaults = ['--tests-pattern', '^f?tests$',
+	'-v'
+	]
 
+[eggdeps]
+recipe = zc.recipe.egg
+eggs = gtkeggdeps
+       tfws.website [app, test]

Modified: Sandbox/darrylcousins/tfws.website/setup.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/setup.py	2008-02-04 03:32:51 UTC (rev 83486)
+++ Sandbox/darrylcousins/tfws.website/setup.py	2008-02-04 03:35:58 UTC (rev 83487)
@@ -40,15 +40,6 @@
                         'zc.table',
                         'jquery.javascript',
                         'jquery.layer',
-                        'mars.adapter',
-                        'mars.contentprovider',
-                        'mars.form',
-                        'mars.layer',
-                        'mars.macro',
-                        'mars.resource',
-                        'mars.template',
-                        'mars.view',
-                        'mars.viewlet',
                         # Add extra requirements here
                         ],
       entry_points="""

Modified: Sandbox/darrylcousins/tfws.website/src/tfws/website/ftests/test_functional.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/src/tfws/website/ftests/test_functional.py	2008-02-04 03:32:51 UTC (rev 83486)
+++ Sandbox/darrylcousins/tfws.website/src/tfws/website/ftests/test_functional.py	2008-02-04 03:35:58 UTC (rev 83487)
@@ -12,8 +12,12 @@
     os.path.dirname(tfws.website.__file__), 'ftesting.zcml')
 
 TestLayer = ZCMLLayer(ftesting_zcml, __name__, 'TestLayer')
-SeleniumTestLayer = ZCMLLayer(ftesting_zcml, __name__, 'SeleniumLayer')
 
+ftest_selenium_zcml = os.path.join(
+    os.path.dirname(tfws.website.__file__), 'ftest-selenium.zcml')
+
+SeleniumTestLayer = ZCMLLayer(ftest_selenium_zcml, __name__, 'SeleniumLayer')
+
 optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
 globs = dict(getRootFolder=getRootFolder)
 
@@ -29,12 +33,12 @@
                 '../BROWSER.txt', setUp=setUp, globs=globs,
                 tearDown=tearDown, optionflags=optionflags)
     test.layer = TestLayer
-    suite.addTest(test)
+    #suite.addTest(test)
     seleniumtest = doctest.DocFileSuite(
                 '../selenium.txt', setUp=setUp, globs=globs,
                 tearDown=tearDown, optionflags=optionflags)
     seleniumtest.layer = SeleniumTestLayer
-    #suite.addTest(seleniumtest)
+    suite.addTest(seleniumtest)
     return suite
 
 if __name__ == '__main__':

Modified: Sandbox/darrylcousins/tfws.website/src/tfws/website/selenium.txt
===================================================================
--- Sandbox/darrylcousins/tfws.website/src/tfws/website/selenium.txt	2008-02-04 03:32:51 UTC (rev 83486)
+++ Sandbox/darrylcousins/tfws.website/src/tfws/website/selenium.txt	2008-02-04 03:35:58 UTC (rev 83487)
@@ -9,6 +9,6 @@
   >>> browser = ExtendedTestBrowser()
   >>> #browser.addHeader('Authorization', 'Basic mgr:mgrpw')
   >>> browser.handleErrors = False
-  >>> browser.open("http://localhost/@@/TestRunner.html")
-  >>> #print browser.contents
+  >>> browser.open("http://localhost/@@/selenium/TestRunner.html")
+  >>> print browser.contents
 



More information about the Checkins mailing list