Skip to content

Commit

Permalink
[fc] Repository: icalendar
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2020-03-09T11:36:26+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: collective/icalendar@c65c6b7

Fixed error in tests with duplicate parameter 'self'.

TypeError: __init__() got multiple values for argument 'self'
https://travis-ci.org/collective/icalendar/jobs/659260349

Files changed:
M src/icalendar/tests/hypothesis/test_fuzzing.py
Repository: icalendar

Branch: refs/heads/master
Date: 2020-03-09T11:37:32+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: collective/icalendar@d1ed9c4

Tests: do less iterations with fuzzy contents.

collective/icalendar#289 (comment)

Files changed:
M src/icalendar/tests/hypothesis/test_fuzzing.py
Repository: icalendar

Branch: refs/heads/master
Date: 2020-03-09T21:44:59+01:00
Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl>
Commit: collective/icalendar@2cc1dac

Merge pull request #309 from collective/maurits/improve-testing

Maurits/improve testing

Files changed:
M src/icalendar/tests/hypothesis/test_fuzzing.py
  • Loading branch information
@mauritsvanrees
mauritsvanrees committed Mar 9, 2020
1 parent b49c0df commit c29a844
Showing 1 changed file with 34 additions and 16 deletions.
50 changes: 34 additions & 16 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,52 @@
Repository: plone.app.testing
Repository: icalendar


Branch: refs/heads/master
Date: 2020-02-22T11:42:34+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.testing/commit/322dfc8671a5c53eedfdb09b8551bb8f6ee8ca93
Date: 2020-03-09T11:36:26+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/collective/icalendar/commit/c65c6b7e3fa0c4e0686de1163427fe5626cec34e

there are no Products.ResourceRegistries anymore
Fixed error in tests with duplicate parameter 'self'.

TypeError: __init__() got multiple values for argument 'self'
https://travis-ci.org/collective/icalendar/jobs/659260349

Files changed:
M src/icalendar/tests/hypothesis/test_fuzzing.py

b"diff --git a/src/icalendar/tests/hypothesis/test_fuzzing.py b/src/icalendar/tests/hypothesis/test_fuzzing.py\nindex 9581f74..cf2a175 100644\n--- a/src/icalendar/tests/hypothesis/test_fuzzing.py\n+++ b/src/icalendar/tests/hypothesis/test_fuzzing.py\n@@ -27,7 +27,11 @@ class TestFuzzing(unittest.TestCase):\n def test_main(self, lines):\n cl = Contentlines()\n for key, params, value in lines:\n- params = Parameters(**params)\n+ try:\n+ params = Parameters(**params)\n+ except TypeError:\n+ # Happens when there is a random parameter 'self'...\n+ continue\n cl.append(Contentline.from_parts(key, params, value))\n cl.append('')\n \n"

Repository: icalendar


Branch: refs/heads/master
Date: 2020-03-09T11:37:32+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/collective/icalendar/commit/d1ed9c42d0330982e323abc8e168e704fb3602d4

Tests: do less iterations with fuzzy contents.

https://github.com/collective/icalendar/pull/289#issuecomment-594219490

Files changed:
A news/69.bugfix
M src/plone/app/testing/layers.py
M src/icalendar/tests/hypothesis/test_fuzzing.py

b"diff --git a/news/69.bugfix b/news/69.bugfix\nnew file mode 100644\nindex 0000000..51545a5\n--- /dev/null\n+++ b/news/69.bugfix\n@@ -0,0 +1,2 @@\n+Do not load Products/ZCML of no longer existing Products.ResourceRegistries.\n+[jensens]\n\\ No newline at end of file\ndiff --git a/src/plone/app/testing/layers.py b/src/plone/app/testing/layers.py\nindex a250b21..c04dbd9 100644\n--- a/src/plone/app/testing/layers.py\n+++ b/src/plone/app/testing/layers.py\n@@ -59,7 +59,6 @@ class PloneFixture(Layer):\n ('Products.MimetypesRegistry', {'loadZCML': True}, ),\n ('Products.PortalTransforms', {'loadZCML': True}, ),\n ('Products.ExtendedPathIndex', {'loadZCML': True}, ),\n- ('Products.ResourceRegistries', {'loadZCML': True}, ),\n ('Products.SiteAccess', {'loadZCML': False}, ),\n ('Products.CMFEditions', {'loadZCML': True}, ),\n ('Products.CMFDiffTool', {'loadZCML': True}, ),\n"
b'diff --git a/src/icalendar/tests/hypothesis/test_fuzzing.py b/src/icalendar/tests/hypothesis/test_fuzzing.py\nindex cf2a175..051f5f5 100644\n--- a/src/icalendar/tests/hypothesis/test_fuzzing.py\n+++ b/src/icalendar/tests/hypothesis/test_fuzzing.py\n@@ -23,7 +23,7 @@ class TestFuzzing(unittest.TestCase):\n st.tuples(key, st.dictionaries(key, value), value),\n min_size=1\n ))\n- @settings(max_examples=10**4)\n+ @settings(max_examples=10**3)\n def test_main(self, lines):\n cl = Contentlines()\n for key, params, value in lines:\n'

Repository: plone.app.testing
Repository: icalendar


Branch: refs/heads/master
Date: 2020-03-09T13:04:01+01:00
Date: 2020-03-09T21:44:59+01:00
Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl>
Commit: https://github.com/plone/plone.app.testing/commit/55ac2727752b7583412a000e82f239c526bdbfba
Commit: https://github.com/collective/icalendar/commit/2cc1dacb59154725d2e9baa95375d049158fc387

Merge pull request #69 from plone/no-more-products.resourceregistries
Merge pull request #309 from collective/maurits/improve-testing

there are no Products.ResourceRegistries anymore
Maurits/improve testing

Files changed:
A news/69.bugfix
M src/plone/app/testing/layers.py
M src/icalendar/tests/hypothesis/test_fuzzing.py

b"diff --git a/news/69.bugfix b/news/69.bugfix\nnew file mode 100644\nindex 0000000..51545a5\n--- /dev/null\n+++ b/news/69.bugfix\n@@ -0,0 +1,2 @@\n+Do not load Products/ZCML of no longer existing Products.ResourceRegistries.\n+[jensens]\n\\ No newline at end of file\ndiff --git a/src/plone/app/testing/layers.py b/src/plone/app/testing/layers.py\nindex a250b21..c04dbd9 100644\n--- a/src/plone/app/testing/layers.py\n+++ b/src/plone/app/testing/layers.py\n@@ -59,7 +59,6 @@ class PloneFixture(Layer):\n ('Products.MimetypesRegistry', {'loadZCML': True}, ),\n ('Products.PortalTransforms', {'loadZCML': True}, ),\n ('Products.ExtendedPathIndex', {'loadZCML': True}, ),\n- ('Products.ResourceRegistries', {'loadZCML': True}, ),\n ('Products.SiteAccess', {'loadZCML': False}, ),\n ('Products.CMFEditions', {'loadZCML': True}, ),\n ('Products.CMFDiffTool', {'loadZCML': True}, ),\n"
b"diff --git a/src/icalendar/tests/hypothesis/test_fuzzing.py b/src/icalendar/tests/hypothesis/test_fuzzing.py\nindex 9581f74..051f5f5 100644\n--- a/src/icalendar/tests/hypothesis/test_fuzzing.py\n+++ b/src/icalendar/tests/hypothesis/test_fuzzing.py\n@@ -23,11 +23,15 @@ class TestFuzzing(unittest.TestCase):\n st.tuples(key, st.dictionaries(key, value), value),\n min_size=1\n ))\n- @settings(max_examples=10**4)\n+ @settings(max_examples=10**3)\n def test_main(self, lines):\n cl = Contentlines()\n for key, params, value in lines:\n- params = Parameters(**params)\n+ try:\n+ params = Parameters(**params)\n+ except TypeError:\n+ # Happens when there is a random parameter 'self'...\n+ continue\n cl.append(Contentline.from_parts(key, params, value))\n cl.append('')\n \n"

0 comments on commit c29a844

Please sign in to comment.