Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zope4 #20

Merged
merged 3 commits into from Jan 29, 2016
Merged

Zope4 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47069c7
Depend on zope.testrunner and fix deprecated usage of zope.testing.te…
thet Jan 26, 2016
307a10e
teardown order is different with zope.testrunner
thet Jan 26, 2016
85d8f5c
Fix layers.rst doctest to be compatible with older and newer zope.tes…
thet Jan 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Expand Up @@ -10,7 +10,11 @@ New:

Fixes:

- *add item here*
- Fix ``layers.rst`` doctest to be compatible with older and newer zope.testrunner layer ordering.
[thet]

- Depend on ``zope.testrunner`` and fix deprecated usage of ``zope.testing.testrunner``.
[thet]


5.0b6 (2015-08-22)
Expand Down
2 changes: 1 addition & 1 deletion plone/app/testing/helpers.rst
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ their canonical locations at ``plone.app.testing.helpers``.

For testing, we need a testrunner

>>> from zope.testing.testrunner import runner
>>> from zope.testrunner import runner

Let's create a custom fixture layer that exercises these helpers. In this
layer, we will perform the following setup:
Expand Down
13 changes: 6 additions & 7 deletions plone/app/testing/layers.rst
View file
Open in desktop
Expand Up @@ -9,7 +9,8 @@ their canonical locations at ``plone.app.testing.layers``.

For testing, we need a testrunner

>>> from zope.testing.testrunner import runner
>>> from zope.testrunner import runner


Plone site fixture
~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -366,9 +367,8 @@ When the server is torn down, the ZServer thread is stopped.

>>> runner.tear_down_unneeded(options, [], setupLayers)
Tear down plone.app.testing.layers.Plone:ZServer in ... seconds.
Tear down plone.app.testing.layers.PloneFixture in ... seconds.
Tear down plone.testing.z2.ZServer in ... seconds.
Tear down plone.testing.z2.Startup in ... seconds.
...Tear down plone.app.testing.layers.PloneFixture in ... seconds.
...Tear down plone.testing.z2.Startup in ... seconds.
Tear down plone.testing.zca.LayerCleanup in ... seconds.

>>> conn = urllib2.urlopen(portal_url + '/folder1', timeout=5)
Expand Down Expand Up @@ -485,9 +485,8 @@ When the server is torn down, the FTP server thread is stopped.

>>> runner.tear_down_unneeded(options, [], setupLayers)
Tear down plone.app.testing.layers.Plone:FTPServer in ... seconds.
Tear down plone.app.testing.layers.PloneFixture in ... seconds.
Tear down plone.testing.z2.FTPServer in ... seconds.
Tear down plone.testing.z2.Startup in ... seconds.
...Tear down plone.app.testing.layers.PloneFixture in ... seconds.
...Tear down plone.testing.z2.Startup in ... seconds.
Tear down plone.testing.zca.LayerCleanup in ... seconds.

>>> ftpClient.connect(host, port, timeout=5)
Expand Down
2 changes: 1 addition & 1 deletion plone/app/testing/selenium.rst
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ and then kill the backgrouned process.

For testing, we need a testrunner

>>> from zope.testing.testrunner import runner
>>> from zope.testrunner import runner

The ``SELENIUM_PLONE_FUNCTIONAL_TESTING`` layer instantiates the
``FunctionalTesting`` class with two bases: ``SELENIUM_FIXTURE``, as
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
'transaction',
'zope.interface',
'zope.publisher',
'zope.testrunner',
]

robot_require = ['robotsuite>=1.4.0',
Expand Down