[Testbot] Plone 5.0 - Python 2.7 - Build # 1615 - Still failing! - failure(s)
jenkins at plone.org
jenkins at plone.org
Tue Feb 18 04:55:20 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1615 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1615/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2013-11-12T10:56:24-08:00
Author: Ramon Navarro Bosch (bloodbare) <ramon.nb at gmail.com>
Commit: https://github.com/plone/plone.app.testing/commit/7d26cbc21c2161e1539eb928b55e17173cdf052d
adding barceloneta to testing
Files changed:
M plone/app/testing/layers.py
diff --git a/plone/app/testing/layers.py b/plone/app/testing/layers.py
index 8827682..98c112c 100644
--- a/plone/app/testing/layers.py
+++ b/plone/app/testing/layers.py
@@ -70,7 +70,8 @@ class PloneFixture(Layer):
('Products.PlacelessTranslationService' , {'loadZCML': True}, ),
('Products.PloneLanguageTool' , {'loadZCML': True}, ),
- ('plonetheme.sunburst' , {'loadZCML': True}, ),
+ # ('plonetheme.sunburst' , {'loadZCML': True}, ),
+ ('plonetheme.barceloneta' , {'loadZCML': True}, ),
('Products.CMFPlone' , {'loadZCML': True}, ),
('Products.PythonScripts' , {'loadZCML': False}, ),
@@ -79,7 +80,8 @@ class PloneFixture(Layer):
# Extension profiles to be installed with site setup
extensionProfiles = (
- 'plonetheme.sunburst:default',
+ # 'plonetheme.sunburst:default',
+ 'plonetheme.barceloneta:default',
)
# Layer lifecycle
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-10T03:00:30-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/plone.app.testing/commit/8639924bb649070fecd3569d6fc1288aa09b4d5c
merge from master
Files changed:
M CHANGES.rst
M plone/app/testing/__init__.py
M plone/app/testing/bbb.py
M plone/app/testing/helpers.py
M plone/app/testing/interfaces.py
M plone/app/testing/layers.py
diff --git a/CHANGES.rst b/CHANGES.rst
index 76dfe3f..17650fb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,10 @@ Changelog
5.0a1 (unreleased)
------------------
+- Add 'ROBOT_TEST_LEVEL' to interfaces, so other packages can import it. This
+ makes things easier if we decide to change the value.
+ [timo]
+
- Replace deprecated test assert statements.
[timo]
@@ -27,6 +31,8 @@ Changelog
- Fix wrong spelling of ``reinstallProducts`` method in quickInstallProduct.
[saily]
+- Sync bbb PloneTestCase class with original one.
+ [tomgross]
4.2.2 (2013-02-09)
------------------
diff --git a/plone/app/testing/__init__.py b/plone/app/testing/__init__.py
index d164ec4..89b0ca9 100644
--- a/plone/app/testing/__init__.py
+++ b/plone/app/testing/__init__.py
@@ -1,54 +1,55 @@
# Layers
from plone.app.testing.layers import (
- PloneFixture,
- PloneTestLifecycle,
- IntegrationTesting,
- FunctionalTesting,
- PLONE_FIXTURE,
+ PloneFixture,
+ PloneTestLifecycle,
+ IntegrationTesting,
+ FunctionalTesting,
+ PLONE_FIXTURE,
- PLONE_INTEGRATION_TESTING,
- PLONE_FUNCTIONAL_TESTING,
+ PLONE_INTEGRATION_TESTING,
+ PLONE_FUNCTIONAL_TESTING,
- PLONE_ZSERVER,
- PLONE_FTP_SERVER,
- )
+ PLONE_ZSERVER,
+ PLONE_FTP_SERVER,
+)
# Helper functions
from plone.app.testing.helpers import (
- login,
- logout,
- setRoles,
+ login,
+ logout,
+ setRoles,
- quickInstallProduct,
- applyProfile,
+ quickInstallProduct,
+ applyProfile,
- pushGlobalRegistry,
- popGlobalRegistry,
+ pushGlobalRegistry,
+ popGlobalRegistry,
- tearDownMultiPluginRegistration,
+ tearDownMultiPluginRegistration,
- ploneSite,
+ ploneSite,
- PloneSandboxLayer,
- PloneWithPackageLayer
- )
+ PloneSandboxLayer,
+ PloneWithPackageLayer
+)
# Constants
from plone.app.testing.interfaces import (
- PLONE_SITE_ID,
- PLONE_SITE_TITLE,
- DEFAULT_LANGUAGE,
+ PLONE_SITE_ID,
+ PLONE_SITE_TITLE,
+ DEFAULT_LANGUAGE,
- TEST_USER_NAME,
- TEST_USER_ID,
- TEST_USER_PASSWORD,
- TEST_USER_ROLES,
+ TEST_USER_NAME,
+ TEST_USER_ID,
+ TEST_USER_PASSWORD,
+ TEST_USER_ROLES,
- SITE_OWNER_NAME,
- SITE_OWNER_PASSWORD
- )
+ SITE_OWNER_NAME,
+ SITE_OWNER_PASSWORD,
+ ROBOT_TEST_LEVEL,
+)
# Cleanup handlers
from plone.app.testing.cleanup import (
- cleanUpMultiPlugins,
- )
+ cleanUpMultiPlugins,
+)
diff --git a/plone/app/testing/bbb.py b/plone/app/testing/bbb.py
index bcfe3f4..32b41e7 100644
--- a/plone/app/testing/bbb.py
+++ b/plone/app/testing/bbb.py
@@ -3,6 +3,7 @@
from plone.testing import z2
from plone.app import testing
from Testing.ZopeTestCase.functional import Functional
+from AccessControl import getSecurityManager
import transaction
import unittest
@@ -83,9 +84,17 @@ def beforeTearDown(self):
def afterTearDown(self):
"""Hook to do teardown after the portal is removed."""
- def setRoles(self, roles):
- """Set the effective roles of the test user."""
- testing.setRoles(self.portal, testing.TEST_USER_ID, roles)
+ def setRoles(self, roles, name=testing.TEST_USER_ID):
+ """Set the effective roles of a user."""
+ testing.setRoles(self.portal, name, roles)
+
+ def setGroups(self, groups, name=testing.TEST_USER_ID):
+ '''Changes the user's groups.'''
+ uf = self.portal['acl_users']
+ uf.userSetGroups(name, list(groups))
+ user = getSecurityManager().getUser()
+ if name == user.getId():
+ self.login(user.getUserName())
def setPermissions(self, permissions, role='Member'):
"""Changes the permissions assigned to role."""
diff --git a/plone/app/testing/helpers.py b/plone/app/testing/helpers.py
index 96cd538..a9f3328 100644
--- a/plone/app/testing/helpers.py
+++ b/plone/app/testing/helpers.py
@@ -9,10 +9,10 @@
from plone.app.testing import layers
from plone.app.testing.interfaces import (
- PLONE_SITE_ID,
- SITE_OWNER_NAME,
- TEST_USER_NAME,
- )
+ PLONE_SITE_ID,
+ SITE_OWNER_NAME,
+ TEST_USER_NAME,
+)
# User management
@@ -405,7 +405,8 @@ def snapshotMultiPlugins(self, preSetupMultiPlugins):
self._addedMultiPlugins = set()
from Products.PluggableAuthService.PluggableAuthService import (
- MultiPlugins)
+ MultiPlugins
+ )
for plugin in MultiPlugins:
if plugin not in preSetupMultiPlugins:
@@ -447,7 +448,8 @@ def setUpZCMLFiles(self):
if self.zcml_filename is None:
raise ValueError("ZCML file name has not been provided.")
if self.zcml_package is None:
- raise ValueError("The package that contains the ZCML file "
+ raise ValueError(
+ "The package that contains the ZCML file "
"has not been provided.")
self.loadZCML(self.zcml_filename, package=self.zcml_package)
diff --git a/plone/app/testing/interfaces.py b/plone/app/testing/interfaces.py
index 5e705b5..0ae7d6f 100644
--- a/plone/app/testing/interfaces.py
+++ b/plone/app/testing/interfaces.py
@@ -2,13 +2,15 @@
# plone.app.testing directly
PLONE_SITE_ID = 'plone'
-PLONE_SITE_TITLE = u"Plone site"
+PLONE_SITE_TITLE = u'Plone site'
DEFAULT_LANGUAGE = 'en'
TEST_USER_NAME = 'test-user'
TEST_USER_ID = 'test_user_1_'
TEST_USER_PASSWORD = 'secret'
-TEST_USER_ROLES = ['Member',]
+TEST_USER_ROLES = ['Member', ]
SITE_OWNER_NAME = 'admin'
SITE_OWNER_PASSWORD = 'secret'
+
+ROBOT_TEST_LEVEL = 5
diff --git a/plone/app/testing/layers.py b/plone/app/testing/layers.py
index 98c112c..3b7e8ce 100644
--- a/plone/app/testing/layers.py
+++ b/plone/app/testing/layers.py
@@ -5,18 +5,19 @@
from plone.testing import zodb, zca, z2
from plone.app.testing.interfaces import (
- PLONE_SITE_ID,
- PLONE_SITE_TITLE,
- DEFAULT_LANGUAGE,
+ PLONE_SITE_ID,
+ PLONE_SITE_TITLE,
+ DEFAULT_LANGUAGE,
- TEST_USER_ID,
- TEST_USER_NAME,
- TEST_USER_PASSWORD,
- TEST_USER_ROLES,
+ TEST_USER_ID,
+ TEST_USER_NAME,
+ TEST_USER_PASSWORD,
+ TEST_USER_ROLES,
+
+ SITE_OWNER_NAME,
+ SITE_OWNER_PASSWORD
+)
- SITE_OWNER_NAME,
- SITE_OWNER_PASSWORD
- )
class PloneFixture(Layer):
"""This layer sets up a basic Plone site, with:
@@ -32,51 +33,49 @@ class PloneFixture(Layer):
# Products that will be installed, plus options
products = (
- ('Products.GenericSetup' , {'loadZCML': True},),
- ('Products.DCWorkflow' , {'loadZCML': True}, ),
- ('Products.ZCTextIndex' , {'loadZCML': True}, ),
+ ('Products.GenericSetup' , {'loadZCML': True},),
+ ('Products.DCWorkflow' , {'loadZCML': True}, ),
+ ('Products.ZCTextIndex' , {'loadZCML': True}, ),
- ('Products.CMFUid' , {'loadZCML': True}, ),
- ('Products.CMFCalendar' , {'loadZCML': True}, ),
+ ('Products.CMFUid' , {'loadZCML': True}, ),
- ('Products.CMFCore' , {'loadZCML': True},),
- ('Products.CMFDefault' , {'loadZCML': True}, ),
+ ('Products.CMFCore' , {'loadZCML': True},),
+ ('Products.CMFDefault' , {'loadZCML': True}, ),
- ('Products.PluggableAuthService' , {'loadZCML': True}, ),
- ('Products.PluginRegistry' , {'loadZCML': True}, ),
- ('Products.PlonePAS' , {'loadZCML': True}, ),
+ ('Products.PluggableAuthService' , {'loadZCML': True}, ),
+ ('Products.PluginRegistry' , {'loadZCML': True}, ),
+ ('Products.PlonePAS' , {'loadZCML': True}, ),
- ('Products.CMFQuickInstallerTool' , {'loadZCML': True}, ),
- ('Products.CMFFormController' , {'loadZCML': True}, ),
- ('Products.CMFDynamicViewFTI' , {'loadZCML': True}, ),
- ('Products.CMFPlacefulWorkflow' , {'loadZCML': True}, ),
+ ('Products.CMFQuickInstallerTool' , {'loadZCML': True}, ),
+ ('Products.CMFFormController' , {'loadZCML': True}, ),
+ ('Products.CMFDynamicViewFTI' , {'loadZCML': True}, ),
+ ('Products.CMFPlacefulWorkflow' , {'loadZCML': True}, ),
- ('Products.MimetypesRegistry' , {'loadZCML': True}, ),
- ('Products.PortalTransforms' , {'loadZCML': True}, ),
+ ('Products.MimetypesRegistry' , {'loadZCML': True}, ),
+ ('Products.PortalTransforms' , {'loadZCML': True}, ),
- ('Products.ExternalEditor' , {'loadZCML': True}, ),
- ('Products.ExtendedPathIndex' , {'loadZCML': True}, ),
- ('Products.ResourceRegistries' , {'loadZCML': True}, ),
- ('Products.SecureMailHost' , {'loadZCML': True}, ),
- ('Products.SiteAccess' , {'loadZCML': False}, ),
+ ('Products.ExternalEditor' , {'loadZCML': True}, ),
+ ('Products.ExtendedPathIndex' , {'loadZCML': True}, ),
+ ('Products.ResourceRegistries' , {'loadZCML': True}, ),
+ ('Products.SecureMailHost' , {'loadZCML': True}, ),
+ ('Products.SiteAccess' , {'loadZCML': False}, ),
- ('Products.PasswordResetTool' , {'loadZCML': True}, ),
+ ('Products.PasswordResetTool' , {'loadZCML': True}, ),
- ('Products.TinyMCE' , {'loadZCML': True}, ),
+ ('Products.TinyMCE' , {'loadZCML': True}, ),
- ('Products.CMFEditions' , {'loadZCML': True}, ),
- ('Products.CMFDiffTool' , {'loadZCML': True}, ),
+ ('Products.CMFEditions' , {'loadZCML': True}, ),
+ ('Products.CMFDiffTool' , {'loadZCML': True}, ),
- ('Products.PlacelessTranslationService' , {'loadZCML': True}, ),
- ('Products.PloneLanguageTool' , {'loadZCML': True}, ),
+ ('Products.PlacelessTranslationService' , {'loadZCML': True}, ),
+ ('Products.PloneLanguageTool' , {'loadZCML': True}, ),
- # ('plonetheme.sunburst' , {'loadZCML': True}, ),
- ('plonetheme.barceloneta' , {'loadZCML': True}, ),
+ ('plonetheme.barceloneta' , {'loadZCML': True}, ),
- ('Products.CMFPlone' , {'loadZCML': True}, ),
- ('Products.PythonScripts' , {'loadZCML': False}, ),
+ ('Products.CMFPlone' , {'loadZCML': True}, ),
+ ('Products.PythonScripts' , {'loadZCML': False}, ),
- )
+ )
# Extension profiles to be installed with site setup
extensionProfiles = (
@@ -122,7 +121,8 @@ def setUpZCML(self):
zca.pushGlobalRegistry()
from zope.configuration import xmlconfig
- self['configurationContext'] = context = zca.stackConfigurationContext(self.get('configurationContext'))
+ self['configurationContext'] = context = zca.stackConfigurationContext(
+ self.get('configurationContext'))
# Turn off z3c.autoinclude
@@ -201,22 +201,24 @@ def setUpDefaultContent(self, app):
# Create the owner user and "log in" so that the site object gets
# the right ownership information
app['acl_users'].userFolderAddUser(
- SITE_OWNER_NAME,
- SITE_OWNER_PASSWORD,
- ['Manager'],
- []
- )
+ SITE_OWNER_NAME,
+ SITE_OWNER_PASSWORD,
+ ['Manager'],
+ []
+ )
z2.login(app['acl_users'], SITE_OWNER_NAME)
# Create the site with the default set of extension profiles
from Products.CMFPlone.factory import addPloneSite
- addPloneSite(app, PLONE_SITE_ID,
- title=PLONE_SITE_TITLE,
- setup_content=False,
- default_language=DEFAULT_LANGUAGE,
- extension_ids=self.extensionProfiles,
- )
+ addPloneSite(
+ app,
+ PLONE_SITE_ID,
+ title=PLONE_SITE_TITLE,
+ setup_content=False,
+ default_language=DEFAULT_LANGUAGE,
+ extension_ids=self.extensionProfiles,
+ )
# Turn off default workflow
app[PLONE_SITE_ID]['portal_workflow'].setDefaultChain('')
@@ -226,9 +228,10 @@ def setUpDefaultContent(self, app):
# directly.
pas = app[PLONE_SITE_ID]['acl_users']
pas.source_users.addUser(
- TEST_USER_ID,
- TEST_USER_NAME,
- TEST_USER_PASSWORD)
+ TEST_USER_ID,
+ TEST_USER_NAME,
+ TEST_USER_PASSWORD
+ )
for role in TEST_USER_ROLES:
pas.portal_role_manager.doAssignRoleToPrincipal(TEST_USER_ID, role)
@@ -240,6 +243,7 @@ def setUpDefaultContent(self, app):
PLONE_FIXTURE = PloneFixture()
+
class PloneTestLifecycle(object):
"""Mixin class for Plone test lifecycle. This exposes the ``portal``
resource and resets the environment between each test.
@@ -303,10 +307,12 @@ def tearDownEnvironment(self, portal):
from zope.site.hooks import setSite
setSite(None)
+
class IntegrationTesting(PloneTestLifecycle, z2.IntegrationTesting):
"""Plone version of the integration testing layer
"""
+
class FunctionalTesting(PloneTestLifecycle, z2.FunctionalTesting):
"""Plone version of the functional testing layer
"""
@@ -317,8 +323,20 @@ class FunctionalTesting(PloneTestLifecycle, z2.FunctionalTesting):
# Note: PLONE_FIXTURE is defined above
-PLONE_INTEGRATION_TESTING = IntegrationTesting(bases=(PLONE_FIXTURE,), name='Plone:Integration')
-PLONE_FUNCTIONAL_TESTING = FunctionalTesting(bases=(PLONE_FIXTURE,), name='Plone:Functional')
-
-PLONE_ZSERVER = FunctionalTesting(bases=(PLONE_FIXTURE, z2.ZSERVER_FIXTURE), name='Plone:ZServer')
-PLONE_FTP_SERVER = FunctionalTesting(bases=(PLONE_FIXTURE, z2.FTP_SERVER_FIXTURE), name='Plone:FTPServer')
+PLONE_INTEGRATION_TESTING = IntegrationTesting(
+ bases=(PLONE_FIXTURE,),
+ name='Plone:Integration'
+)
+PLONE_FUNCTIONAL_TESTING = FunctionalTesting(
+ bases=(PLONE_FIXTURE,),
+ name='Plone:Functional'
+)
+
+PLONE_ZSERVER = FunctionalTesting(
+ bases=(PLONE_FIXTURE, z2.ZSERVER_FIXTURE),
+ name='Plone:ZServer'
+)
+PLONE_FTP_SERVER = FunctionalTesting(
+ bases=(PLONE_FIXTURE, z2.FTP_SERVER_FIXTURE),
+ name='Plone:FTPServer'
+)
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-11T05:22:36-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/plone.app.testing/commit/b9bd3f14a85c1a62f105aba7d57035426b70c448
test a different profile than sunburst
Files changed:
M plone/app/testing/helpers.rst
M plone/app/testing/layers.py
M plone/app/testing/layers.rst
diff --git a/plone/app/testing/helpers.rst b/plone/app/testing/helpers.rst
index 7af6d5c..22abaaf 100644
--- a/plone/app/testing/helpers.rst
+++ b/plone/app/testing/helpers.rst
@@ -86,7 +86,7 @@ need to tear that down as well.
... helpers.quickInstallProduct(portal, 'plone.resource')
...
... # Apply a GenericSetup (extension) profile
- ... helpers.applyProfile(portal, 'plonetheme.sunburst:default')
+ ... helpers.applyProfile(portal, 'plone.app.theming:default')
...
... def tearDown(self):
...
@@ -138,9 +138,9 @@ and the results of the profile having been applied.
>>> with helpers.ploneSite() as portal:
... print portal['portal_quickinstaller'].isProductInstalled('plone.resource')
- ... print portal['portal_skins'].getDefaultSkin()
+ ... print portal['portal_quickinstaller'].isProductInstalled('plone.app.theming')
+ True
True
- Sunburst Theme
Let's now simulate a test.
@@ -203,11 +203,11 @@ should not.
>>> with helpers.ploneSite() as portal:
... print portal.title
... print portal['portal_quickinstaller'].isProductInstalled('plone.resource')
- ... print portal['portal_skins'].getDefaultSkin()
+ ... print portal['portal_quickinstaller'].isProductInstalled('plone.app.theming')
... 'folder1' in portal.objectIds()
New title
True
- Sunburst Theme
+ True
False
We'll now tear down just the ``HELPER_DEMOS_INTEGRATION_TESTING`` layer. At this
@@ -224,10 +224,10 @@ component architecture changes from our layer.
>>> with helpers.ploneSite() as portal:
... print portal.title
... print portal['portal_quickinstaller'].isProductInstalled('plone.resource')
- ... print portal['portal_skins'].getDefaultSkin()
+ ... print portal['portal_quickinstaller'].isProductInstalled('plone.app.theming')
Plone site
False
- Sunburst Theme
+ True
Let's tear down the rest of the layers too.
diff --git a/plone/app/testing/layers.py b/plone/app/testing/layers.py
index 3b7e8ce..b82e96d 100644
--- a/plone/app/testing/layers.py
+++ b/plone/app/testing/layers.py
@@ -79,7 +79,6 @@ class PloneFixture(Layer):
# Extension profiles to be installed with site setup
extensionProfiles = (
- # 'plonetheme.sunburst:default',
'plonetheme.barceloneta:default',
)
diff --git a/plone/app/testing/layers.rst b/plone/app/testing/layers.rst
index 4c6dd01..5085e15 100644
--- a/plone/app/testing/layers.rst
+++ b/plone/app/testing/layers.rst
@@ -67,8 +67,8 @@ Inside the Plone site, the default theme is installed
>>> from plone.app.testing import helpers
>>> with helpers.ploneSite() as portal:
- ... print portal['portal_skins'].getDefaultSkin()
- Sunburst Theme
+ ... print portal['portal_registry']['plone.app.theming.interfaces.IThemeSettings.rules']
+ /++theme++barceloneta/rules.xml
**Note:** Here, we have used the ``ploneSite`` context manager to get hold of
the Plone site root. Like ``z2.zopeApp()``, this is intended for use during
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-11T07:14:59-08:00
Author: Roel Bruggink (jaroel) <roel at jaroel.nl>
Commit: https://github.com/plone/plone.app.testing/commit/eac2d8acbc115dd9aa6592c6492920a19cc79f82
Products.TinyMCE won't be in Plone 5 by default
Files changed:
M plone/app/testing/layers.py
diff --git a/plone/app/testing/layers.py b/plone/app/testing/layers.py
index eb08a7c..b120d47 100644
--- a/plone/app/testing/layers.py
+++ b/plone/app/testing/layers.py
@@ -1,5 +1,6 @@
# Layers setting up fixtures with a Plone site. Also importable from
# plone.app.testing directly
+import pkg_resources
from plone.testing import Layer
from plone.testing import zodb, zca, z2
@@ -61,9 +62,14 @@ class PloneFixture(Layer):
('Products.SiteAccess' , {'loadZCML': False}, ),
('Products.PasswordResetTool' , {'loadZCML': True}, ),
+ )
+ if pkg_resources.get_distribution("Products.CMFPlone").version < 5:
+ products += (
('Products.TinyMCE' , {'loadZCML': True}, ),
+ )
+ products += (
('Products.CMFEditions' , {'loadZCML': True}, ),
('Products.CMFDiffTool' , {'loadZCML': True}, ),
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-11T16:07:15-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/plone.app.testing/commit/29bbcaaab42b329d429cb108a83ea128ba1648d8
fix test
Files changed:
M plone/app/testing/layers.rst
diff --git a/plone/app/testing/layers.rst b/plone/app/testing/layers.rst
index 5085e15..a1d238f 100644
--- a/plone/app/testing/layers.rst
+++ b/plone/app/testing/layers.rst
@@ -406,8 +406,9 @@ indicate where Zope is running.
'localhost'
>>> port = layers.PLONE_FTP_SERVER['port']
- >>> port
- 55002
+ >>> import os
+ >>> port == int(os.environ.get('FTPSERVER_PORT', 55002))
+ True
Let's now simulate a test. Test setup does nothing beyond what the base layers
do.
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-11T22:43:40-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/plone.app.testing/commit/557f3d0693d8937dc0f504b3873f8691b291575f
don't install tinymce any longer
Files changed:
M plone/app/testing/layers.py
diff --git a/plone/app/testing/layers.py b/plone/app/testing/layers.py
index b82e96d..820a3a4 100644
--- a/plone/app/testing/layers.py
+++ b/plone/app/testing/layers.py
@@ -62,8 +62,6 @@ class PloneFixture(Layer):
('Products.PasswordResetTool' , {'loadZCML': True}, ),
- ('Products.TinyMCE' , {'loadZCML': True}, ),
-
('Products.CMFEditions' , {'loadZCML': True}, ),
('Products.CMFDiffTool' , {'loadZCML': True}, ),
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-12T00:41:07-08:00
Author: Roel Bruggink (jaroel) <roel at jaroel.nl>
Commit: https://github.com/plone/plone.app.testing/commit/e74c7aeda6a73b6d0effe611e0d908e01431f9e1
Fix tests without P.TinyMCE
Files changed:
M plone/app/testing/layers.py
diff --git a/plone/app/testing/layers.py b/plone/app/testing/layers.py
index b120d47..1d143e7 100644
--- a/plone/app/testing/layers.py
+++ b/plone/app/testing/layers.py
@@ -1,6 +1,5 @@
# Layers setting up fixtures with a Plone site. Also importable from
# plone.app.testing directly
-import pkg_resources
from plone.testing import Layer
from plone.testing import zodb, zca, z2
@@ -62,14 +61,7 @@ class PloneFixture(Layer):
('Products.SiteAccess' , {'loadZCML': False}, ),
('Products.PasswordResetTool' , {'loadZCML': True}, ),
- )
-
- if pkg_resources.get_distribution("Products.CMFPlone").version < 5:
- products += (
- ('Products.TinyMCE' , {'loadZCML': True}, ),
- )
- products += (
('Products.CMFEditions' , {'loadZCML': True}, ),
('Products.CMFDiffTool' , {'loadZCML': True}, ),
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-12T08:49:35-08:00
Author: Roel Bruggink (jaroel) <roel at jaroel.nl>
Commit: https://github.com/plone/plone.app.testing/commit/ec02465bb9404e6e664463be76d01a1fa973c659
Merge branch 'master' into mockup-ticket-220
* master:
compare to the right value
Make PLONE_FTP_SERVER tests pass also if they run on Jenkins with the port allocator plugin.
Revert "Remove P.TinyMCE"
Remove P.TinyMCE
Files changed:
M plone/app/testing/layers.rst
diff --git a/plone/app/testing/layers.rst b/plone/app/testing/layers.rst
index 4c6dd01..b6ab606 100644
--- a/plone/app/testing/layers.rst
+++ b/plone/app/testing/layers.rst
@@ -406,8 +406,9 @@ indicate where Zope is running.
'localhost'
>>> port = layers.PLONE_FTP_SERVER['port']
- >>> port
- 55002
+ >>> import os
+ >>> port == int(os.environ.get('FTPSERVER_PORT', 55002))
+ True
Let's now simulate a test. Test setup does nothing beyond what the base layers
do.
Repository: plone.app.testing
Branch: refs/heads/master
Date: 2014-02-13T07:46:39-08:00
Author: Roel Bruggink (jaroel) <roel at jaroel.nl>
Commit: https://github.com/plone/plone.app.testing/commit/bb20ea4c347dbea42545e6a2c0de5feb42a60051
Merge branch 'mockup-ticket-220' into barceloneta
* mockup-ticket-220:
Fix tests without P.TinyMCE
compare to the right value
Make PLONE_FTP_SERVER tests pass also if they run on Jenkins with the port allocator plugin.
Revert "Remove P.TinyMCE"
Remove P.TinyMCE
Products.TinyMCE won't be in Plone 5 by default
Files changed:
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 26347 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140218/a0c6fc3a/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 35179 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140218/a0c6fc3a/attachment-0003.obj>
More information about the Testbot
mailing list