[Zope-Checkins] SVN: Zope/trunk/ Removed Examples.zexp from the skeleton. The TTW shopping cart isn't any good example of Zope usage anymore.
Log message for revision 90455: Removed Examples.zexp from the skeleton. The TTW shopping cart isn't any good example of Zope usage anymore. Changed: U Zope/trunk/doc/CHANGES.txt D Zope/trunk/skel/import/Examples.zexp -=- Modified: Zope/trunk/doc/CHANGES.txt === --- Zope/trunk/doc/CHANGES.txt 2008-08-27 14:05:44 UTC (rev 90454) +++ Zope/trunk/doc/CHANGES.txt 2008-08-27 14:08:57 UTC (rev 90455) @@ -9,6 +9,9 @@ Restructuring + - Removed Examples.zexp from the skeleton. The TTW shopping cart isn't +any good example of Zope usage anymore. + - Removed deprecated ZTUtil.Iterator module - Removed deprecated StructuredText module Deleted: Zope/trunk/skel/import/Examples.zexp === (Binary files differ) ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/ Remove tests that depend on the presence of the Examples.zexp
Log message for revision 90454:
Remove tests that depend on the presence of the Examples.zexp
Changed:
U Zope/trunk/lib/python/Testing/ZopeTestCase/doc/HOWTO.stx
U Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/testPortalTestCase.py
D Zope/trunk/lib/python/Testing/ZopeTestCase/testShoppingCart.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/testZopeTestCase.py
-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/HOWTO.stx
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/HOWTO.stx2008-08-27
13:47:48 UTC (rev 90453)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/HOWTO.stx2008-08-27
14:05:44 UTC (rev 90454)
@@ -178,9 +178,6 @@
It demonstrates how to manipulate the test user's roles and
permissions and how
security is validated.
-- **'testShoppingCart.py'** tests the ShoppingCart example. This test
- uses Sessions and shows how to test a TTW Zope application.
-
- **'testFunctional.py'** demonstrates the new functional testing
features.
Tests may call 'self.publish()' to simulate URL calls to the
ZPublisher.
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
2008-08-27 13:47:48 UTC (rev 90453)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
2008-08-27 14:05:44 UTC (rev 90454)
@@ -15,9 +15,8 @@
NOTE: This is *not* an example TestCase. Do not
use this file as a blueprint for your own tests!
-See testPythonScript.py and testShoppingCart.py for
-example test cases. See testSkeleton.py for a quick
-way of getting started.
+See testPythonScript.py for example test cases. See testSkeleton.py for a
+quick way of getting started.
$Id$
"""
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/testPortalTestCase.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/testPortalTestCase.py
2008-08-27 13:47:48 UTC (rev 90453)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/testPortalTestCase.py
2008-08-27 14:05:44 UTC (rev 90454)
@@ -15,9 +15,8 @@
NOTE: This is *not* an example TestCase. Do not
use this file as a blueprint for your own tests!
-See testPythonScript.py and testShoppingCart.py for
-example test cases. See testSkeleton.py for a quick
-way of getting started.
+See testPythonScript.py for example test cases. See testSkeleton.py for a
+quick way of getting started.
$Id$
"""
Deleted: Zope/trunk/lib/python/Testing/ZopeTestCase/testShoppingCart.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/testShoppingCart.py
2008-08-27 13:47:48 UTC (rev 90453)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/testShoppingCart.py
2008-08-27 14:05:44 UTC (rev 90454)
@@ -1,143 +0,0 @@
-##
-#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##
-"""Example ZopeTestCase testing the ShoppingCart example application
-
-Note the use of sessions and how the SESSION object is added to
-the REQUEST in afterSetUp().
-
-You can use zLOG.LOG() if you set up the event log variables first.
-Handy for debugging and tracing your tests.
-
-$Id$
-"""
-
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
-#os.environ['STUPID_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-#os.environ['STUPID_LOG_SEVERITY'] = '0'
-
-from Testing import ZopeTestCase
-
-from Testing.ZopeTestCase import layer
-from Testing.ZopeTestCase import utils
-from Testing.ZopeTestCase import transaction
-
-from Globals import SOFTWARE_HOME
-examples_path = os.path.join(SOFTWARE_HOME, '..', '..', 'skel', 'import',
'Examples.zexp')
-examples_path = os.path.abspath(examples_path)
-
-
-class ShoppingCartLayer(layer.ZopeLite):
-
-@classmethod
-def setUp(cls):
-# Set up sessioning objects
-utils.appcall(utils.setupCoreSessions)
-
-# Set up example applications
-utils.appcall(utils.importObjectFromFile, examples_path, quiet=1)
-
-@classmethod
-def tearDown(cls):
-def cleanup(app):
-app._delObject('Examp
[Zope-Checkins] SVN: Zope/trunk/inst/Makefile.in Fixed the excludes.
Log message for revision 90446:
Fixed the excludes.
Changed:
U Zope/trunk/inst/Makefile.in
-=-
Modified: Zope/trunk/inst/Makefile.in
===
--- Zope/trunk/inst/Makefile.in 2008-08-27 12:49:35 UTC (rev 90445)
+++ Zope/trunk/inst/Makefile.in 2008-08-27 13:01:39 UTC (rev 90446)
@@ -105,7 +105,7 @@
clean: unbuild
${FIND} "${BASE_DIR}" \
-name '*.py[co]' -o -name '*.so' -o -name '*.o' | \
- grep -vE "${BASE_DIR}/src|${BASE_DIR}/parts|${BASE_DIR}/eggs" | \
+ grep -vE
"${BASE_DIR}/src|${BASE_DIR}/parts|${BASE_DIR}/eggs|${BASE_DIR}/develop" | \
${XARGS} ${RM}
${RM} "$(BASE_DIR)/lib/python/Zope2/version.txt"
${RMRF} build
@@ -127,17 +127,24 @@
${TAR} czfh ${BASE_DIR}/${PACKAGE_NAME}.tgz \
--exclude=${PACKAGE_NAME}.tgz\
--exclude=.svn\
- --exclude=.installed.cfg \
+ --exclude=${PACKAGE_NAME}/.installed.cfg \
--exclude=.DS_Store \
- --exclude=makefile \
- --exclude=build-base \
- --exclude=bootstrap \
- --exclude=develop-eggs \
- --exclude=eggs \
- --exclude=include \
- --exclude=parts \
- --exclude=src \
- --exclude=*.cfg \
+ --exclude=${PACKAGE_NAME}/bin \
+ --exclude=${PACKAGE_NAME}/etc \
+ --exclude=${PACKAGE_NAME}/import \
+ --exclude=${PACKAGE_NAME}/log \
+ --exclude=${PACKAGE_NAME}/var \
+ --exclude=${PACKAGE_NAME}/Products \
+ --exclude=${PACKAGE_NAME}/makefile \
+ --exclude=${PACKAGE_NAME}/build-base \
+ --exclude=${PACKAGE_NAME}/bootstrap \
+ --exclude=${PACKAGE_NAME}/develop-eggs \
+ --exclude=${PACKAGE_NAME}/develop \
+ --exclude=${PACKAGE_NAME}/eggs \
+ --exclude=${PACKAGE_NAME}/include \
+ --exclude=${PACKAGE_NAME}/parts \
+ --exclude=${PACKAGE_NAME}/src \
+ --exclude=${PACKAGE_NAME}/*.cfg \
--exclude=*~ \
--exclude=.#* ${PACKAGE_NAME}
${RMRF} ${TMPDIR}/${PACKAGE_NAME}
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/ Removed references to software home.
Log message for revision 90443: Removed references to software home. Changed: U Zope/trunk/lib/python/Testing/ZopeTestCase/doc/ENVIRONMENT.txt U Zope/trunk/lib/python/Testing/ZopeTestCase/doc/README.stx U Zope/trunk/lib/python/Testing/ZopeTestCase/doc/TIMELINES.txt D Zope/trunk/lib/python/Testing/ZopeTestCase/framework.py D Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/framework.py -=- Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/ENVIRONMENT.txt === --- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/ENVIRONMENT.txt 2008-08-27 12:46:35 UTC (rev 90442) +++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/ENVIRONMENT.txt 2008-08-27 12:47:43 UTC (rev 90443) @@ -2,14 +2,9 @@ ZTC makes the following assumptions about its environment: a) The 'ZopeTestCase' package is installed in the Zope "trunk" inside the - 'Testing' module, which means: SOFTWARE_HOME/Testing/ZopeTestCase. + 'Testing' module. -b) A 'Products' directory exists inside SOFTWARE_HOME and INSTANCE_HOME. - -c) The tests (the 'tests' subdirectories) are located either below a - SOFTWARE_HOME or INSTANCE_HOME, typically in Products/MyCoolProduct/tests. - -d) The somewhat weak assumption is that ZTC can walk up the directory tree from +b) The somewhat weak assumption is that ZTC can walk up the directory tree from 'tests', and find a 'Products' directory. This is how INSTANCE_HOME detection works. It regrettably fails on some filesystems when symbolic links are involved (a solution is detailed below, so hang on). @@ -24,8 +19,7 @@ ZTC attempts to resolve this by detecting an INSTANCE_HOME for 1) but leaving -the actual environment variable untouched so 2) works by still pointing into -SOFTWARE_HOME/Testing. +the actual environment variable untouched. As soon as I allow you to set INSTANCE_HOME yourself, I lose the ability to distinguish whether you mean 1) or 2) or both. Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/README.stx === --- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/README.stx 2008-08-27 12:46:35 UTC (rev 90442) +++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/README.stx 2008-08-27 12:47:43 UTC (rev 90443) @@ -43,27 +43,9 @@ Note that there is a skeleton test suite named 'testSkeleton.py' that you may copy into your 'tests' directory and take it from there. -Note also that when the tests are run in an INSTANCE_HOME installation of -Zope, you must set the SOFTWARE_HOME environment variable for the 'Testing' -and 'ZopeTestCase' packages to be found. - See the sample tests in the 'ZopeTestCase' directory for details on writing your own tests. -framework.py - -1. Uses SOFTWARE_HOME (if set) to locate the Testing package. - -2. Detects and handles INSTANCE_HOME installations of Zope. Please - see ENVIRONMENT.txt for the assumptions ZTC makes about its - environment. - -3. Supports setting up a ZODB from a 'custom_zodb.py' file in - the 'tests' directory. - -4. Allows to connect to a running ZEO server by setting the - ZEO_INSTANCE_HOME environment variable. - testrunner.py Alternatively, you may use Zope's testrunner utility to run your tests @@ -71,8 +53,7 @@ installation). If you do so, you will have to define a 'test_suite' method in your modules (see examples). -There is no need to set SOFTWARE_HOME when using the testrunner but you may -have to provide the -i flag when testing in an INSTANCE_HOME setup. +You may have to provide the -i flag when testing in an INSTANCE_HOME setup. Example: 'python /path/to/Zope/utilities/testrunner.py -q -i -a' Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/TIMELINES.txt === --- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/TIMELINES.txt 2008-08-27 12:46:35 UTC (rev 90442) +++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/TIMELINES.txt 2008-08-27 12:47:43 UTC (rev 90443) @@ -5,7 +5,6 @@ 1. includes file framework.py 1.1 locates and imports the Testing package by means of -- SOFTWARE_HOME environment variable - auto-detection 1.2 locates and includes file ztc_common.py Deleted: Zope/trunk/lib/python/Testing/ZopeTestCase/framework.py === --- Zope/trunk/lib/python/Testing/ZopeTestCase/framework.py 2008-08-27 12:46:35 UTC (rev 90442) +++ Zope/trunk/lib/python/Testing/ZopeTestCase/framework.py 2008-08-27 12:47:43 UTC (rev 90443) @@ -1,116 +0,0 @@ -## -# -# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved. -# -# This software is subje
[Zope-Checkins] SVN: Zope/trunk/lib/python/App/dtml/ Removed references to software home
Log message for revision 90442: Removed references to software home Changed: U Zope/trunk/lib/python/App/dtml/cpContents.dtml U Zope/trunk/lib/python/App/dtml/debug.dtml U Zope/trunk/lib/python/App/dtml/zope_quick_start.dtml -=- Modified: Zope/trunk/lib/python/App/dtml/cpContents.dtml === --- Zope/trunk/lib/python/App/dtml/cpContents.dtml 2008-08-27 12:45:41 UTC (rev 90441) +++ Zope/trunk/lib/python/App/dtml/cpContents.dtml 2008-08-27 12:46:35 UTC (rev 90442) @@ -47,30 +47,6 @@ - SOFTWARE_HOME - - - - - &dtml-getSOFTWARE_HOME; - - - - - - - ZOPE_HOME - - - - - &dtml-getZOPE_HOME; - - - - - - INSTANCE_HOME Modified: Zope/trunk/lib/python/App/dtml/debug.dtml === --- Zope/trunk/lib/python/App/dtml/debug.dtml 2008-08-27 12:45:41 UTC (rev 90441) +++ Zope/trunk/lib/python/App/dtml/debug.dtml 2008-08-27 12:46:35 UTC (rev 90442) @@ -41,7 +41,6 @@ Zope version: &dtml-version_txt; Python version: &dtml-sys_version; System Platform: &dtml-sys_platform; -SOFTWARE_HOME: &dtml-getSOFTWARE_HOME; INSTANCE_HOME: &dtml-getINSTANCE_HOME; CLIENT_HOME: &dtml-getCLIENT_HOME; Process ID: &dtml-process_id; (&dtml-thread_get_ident;) Modified: Zope/trunk/lib/python/App/dtml/zope_quick_start.dtml === --- Zope/trunk/lib/python/App/dtml/zope_quick_start.dtml2008-08-27 12:45:41 UTC (rev 90441) +++ Zope/trunk/lib/python/App/dtml/zope_quick_start.dtml2008-08-27 12:46:35 UTC (rev 90442) @@ -41,8 +41,6 @@ If you're running Zope on Windows, you'll need to use the "zpasswd.py" utility -in your Zope installation's "bin" directory at -\bin to create a file named inituser in your Zope instance home at that contains the initial administrative username and password. ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/ Removed old framework testrunner and removed references to software home.
Log message for revision 90441:
Removed old framework testrunner and removed references to software home.
Changed:
U Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py
D Zope/trunk/lib/python/Products/Five/browser/tests/framework.py
U Zope/trunk/lib/python/Products/Five/browser/tests/pts_test_languages.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_absoluteurl.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_adding.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_decode.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_defaultview.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_i18n.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_menu.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_pages.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_provider.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_recurse.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_resource.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_traversable.py
U Zope/trunk/lib/python/Products/Five/browser/tests/test_zope3security.py
D Zope/trunk/lib/python/Products/Five/form/tests/framework.py
U Zope/trunk/lib/python/Products/Five/form/tests/test_forms.py
D Zope/trunk/lib/python/Products/Five/formlib/tests/framework.py
U Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py
D Zope/trunk/lib/python/Products/Five/skin/tests/framework.py
U Zope/trunk/lib/python/Products/Five/skin/tests/test_standardmacros.py
U Zope/trunk/lib/python/Products/Five/tests/boilerplate.py
D Zope/trunk/lib/python/Products/Five/tests/framework.py
U Zope/trunk/lib/python/Products/Five/tests/test_directives.py
U Zope/trunk/lib/python/Products/Five/tests/test_event.py
U Zope/trunk/lib/python/Products/Five/tests/test_i18n.py
U Zope/trunk/lib/python/Products/Five/tests/test_registerclass.py
U Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py
U Zope/trunk/lib/python/Products/Five/tests/test_security.py
U Zope/trunk/lib/python/Products/Five/tests/test_size.py
D Zope/trunk/lib/python/Products/Five/utilities/browser/tests/framework.py
U Zope/trunk/lib/python/Products/Five/utilities/browser/tests/test_marker.py
U Zope/trunk/lib/python/Products/Five/zcml.py
U Zope/trunk/lib/python/Products/OFSP/help/Control-Panel_Contents.stx
-=-
Modified:
Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py
===
--- Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py
2008-08-27 12:36:47 UTC (rev 90440)
+++ Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py
2008-08-27 12:45:41 UTC (rev 90441)
@@ -17,9 +17,6 @@
$Id$
"""
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
def test_suite():
from Testing.ZopeTestCase import installProduct, FunctionalDocFileSuite
@@ -56,6 +53,3 @@
return FunctionalDocFileSuite('cps_test_localizer.txt',
package='Products.Five.browser.tests')
-
-if __name__ == '__main__':
-framework()
Deleted: Zope/trunk/lib/python/Products/Five/browser/tests/framework.py
===
--- Zope/trunk/lib/python/Products/Five/browser/tests/framework.py
2008-08-27 12:36:47 UTC (rev 90440)
+++ Zope/trunk/lib/python/Products/Five/browser/tests/framework.py
2008-08-27 12:45:41 UTC (rev 90441)
@@ -1,107 +0,0 @@
-##
-#
-# ZopeTestCase
-#
-# COPY THIS FILE TO YOUR 'tests' DIRECTORY.
-#
-# This version of framework.py will use the SOFTWARE_HOME
-# environment variable to locate Zope and the Testing package.
-#
-# If the tests are run in an INSTANCE_HOME installation of Zope,
-# Products.__path__ and sys.path with be adjusted to include the
-# instance's Products and lib/python directories respectively.
-#
-# If you explicitly set INSTANCE_HOME prior to running the tests,
-# auto-detection is disabled and the specified path will be used
-# instead.
-#
-# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME
-# will be adjusted to use it.
-#
-# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup
-# is assumed, and you can attach to a running ZEO server (via the
-# instance's custom_zodb.py).
-#
-##
-#
-# The following code should be at the top of every test module:
-#
-# import os, sys
-# if __name__ == '__main__':
-# execfile(os.path.join(sys.path[0], 'framework.py'))
-#
-# ...and the following at the bottom:
-#
-# if __name__ == '__
[Zope-Checkins] SVN: Zope/trunk/inst/Makefile.in Some more changes to accomodate for the Zope2 egg/buildout.
Log message for revision 90414:
Some more changes to accomodate for the Zope2 egg/buildout.
Changed:
U Zope/trunk/inst/Makefile.in
-=-
Modified: Zope/trunk/inst/Makefile.in
===
--- Zope/trunk/inst/Makefile.in 2008-08-27 09:06:27 UTC (rev 90413)
+++ Zope/trunk/inst/Makefile.in 2008-08-27 09:32:04 UTC (rev 90414)
@@ -25,6 +25,7 @@
RM=rm -f
RMRF=rm -rf
FIND=find
+GREP=grep
XARGS=xargs
CD=cd
LN=ln -sfn
@@ -103,7 +104,9 @@
# the source directory for good measure.
clean: unbuild
${FIND} "${BASE_DIR}" \
- -name '*.py[co]' -o -name '*.so' -o -name '*.o' | ${XARGS} ${RM}
+ -name '*.py[co]' -o -name '*.so' -o -name '*.o' | \
+ grep -vE "${BASE_DIR}/src|${BASE_DIR}/parts|${BASE_DIR}/eggs" | \
+ ${XARGS} ${RM}
${RM} "$(BASE_DIR)/lib/python/Zope2/version.txt"
${RMRF} build
@@ -112,7 +115,7 @@
printf "Zope ${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG}" >\
"${BASE_DIR}/lib/python/Zope2/version.txt"
-sdist: clobber sdist_tgz
+sdist: clean sdist_tgz
# sdist_tgz: Create a tgz archive file as a source distribution.
#
@@ -130,6 +133,7 @@
--exclude=build-base \
--exclude=bootstrap \
--exclude=develop-eggs \
+ --exclude=eggs \
--exclude=include \
--exclude=parts \
--exclude=src \
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
