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

Switch to new testcase using AT after PloneTestcase is now DX #111

Merged
merged 1 commit into from Sep 27, 2018
Merged

Switch to new testcase using AT after PloneTestcase is now DX #111

merged 1 commit into from Sep 27, 2018

Conversation

pbauer
Copy link
Sponsor Member

@pbauer pbauer commented Sep 24, 2018

No description provided.

@pbauer pbauer mentioned this pull request Sep 24, 2018
Merged
9 tasks
@pbauer pbauer merged commit be499a0 into master Sep 27, 2018
mauritsvanrees added a commit to plone/buildout.coredev that referenced this pull request Sep 27, 2018
@mauritsvanrees
Temporarily revert checkout of Products.Archetypes.
579e89b 
The master change of today, using plone.app.testing.bbb_at, only works with the master of plone.app.testing,
which is not in use in 5.1.
This creates test errors in ATContentTypes.
See https://jenkins.plone.org/job/plone-5.1-python-2.7-at/1604/

We may need to create a branch of Products.Archetypes.
See plone/Products.Archetypes#111
@mauritsvanrees
Copy link
Sponsor Member

This breaks the AT tests on 5.1, which still uses Archetypes master.
I have temporarily reverted the checkout of Products.Archetypes on coredev 5.1, which should fix this.

Several options:

  1. Create a branch 1.15.x of Products.Archetypes and let 5.1 use that.
  2. Edit the Archetypes code changed in here to conditionally import bbb_at and if that fails, use bbb.

Any preference?

@gforcada gforcada deleted the testlayer branch September 27, 2018 23:15
@pbauer
Copy link
Sponsor Member Author

pbauer commented Sep 28, 2018 •
edited

@mauritsvanrees the second option is much smarter than what I did 🤦‍♂️
I think we should do that for all packages mentioned in plone/plone.app.testing#51

@mauritsvanrees
Copy link
Sponsor Member

I think that is only needed for packages where the master branch is used in both 5.2 and 5.1. Which is only Products.Archetypes. I am working on that now.

mauritsvanrees added a commit that referenced this pull request Sep 28, 2018
@mauritsvanrees
Made the bbb_at imports conditional.
45afdfc 
Fall back to plone.app.testing.bbb, needed in plone.app.testing 5 or earlier.
#111
mauritsvanrees added a commit that referenced this pull request Sep 28, 2018
@mauritsvanrees
Made the bbb_at imports conditional.
4e961dc 
Fall back to plone.app.testing.bbb, needed in plone.app.testing 5 or earlier.
#111
@mauritsvanrees mauritsvanrees mentioned this pull request Sep 28, 2018
Merged
@mauritsvanrees
Copy link
Sponsor Member

PR: #112

mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request Sep 30, 2018
@pbauer
[fc] Repository: Products.Archetypes
86c3d89 
Branch: refs/heads/master
Date: 2018-09-28T11:23:27+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.Archetypes@4e961dc

Made the bbb_at imports conditional.

Fall back to plone.app.testing.bbb, needed in plone.app.testing 5 or earlier.
plone/Products.Archetypes#111

Files changed:
M CHANGES.rst
M Products/Archetypes/tests/attestcase.py
M Products/Archetypes/tests/test_date_components_support_script.py
M Products/Archetypes/tests/test_interfaces.py
Repository: Products.Archetypes

Branch: refs/heads/master
Date: 2018-09-30T07:19:40+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/Products.Archetypes@6804a0f

Merge pull request #112 from plone/conditional-bbb-at-imports

Made the bbb_at imports conditional.

Files changed:
M CHANGES.rst
M Products/Archetypes/tests/attestcase.py
M Products/Archetypes/tests/test_date_components_support_script.py
M Products/Archetypes/tests/test_interfaces.py
mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request Sep 30, 2018
@pbauer
[fc] Repository: Products.Archetypes
fccf316 
Branch: refs/heads/master
Date: 2018-09-28T11:23:27+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.Archetypes@4e961dc

Made the bbb_at imports conditional.

Fall back to plone.app.testing.bbb, needed in plone.app.testing 5 or earlier.
plone/Products.Archetypes#111

Files changed:
M CHANGES.rst
M Products/Archetypes/tests/attestcase.py
M Products/Archetypes/tests/test_date_components_support_script.py
M Products/Archetypes/tests/test_interfaces.py
Repository: Products.Archetypes

Branch: refs/heads/master
Date: 2018-09-30T07:19:40+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/Products.Archetypes@6804a0f

Merge pull request #112 from plone/conditional-bbb-at-imports

Made the bbb_at imports conditional.

Files changed:
M CHANGES.rst
M Products/Archetypes/tests/attestcase.py
M Products/Archetypes/tests/test_date_components_support_script.py
M Products/Archetypes/tests/test_interfaces.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@pbauer @mauritsvanrees