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 committed Mar 9, 2020
1 parent b3cd956 commit b65fdd4
Showing 1 changed file with 33 additions and 17 deletions.
50 changes: 33 additions & 17 deletions last_commit.txt
@@ -1,36 +1,52 @@
Repository: plone.releaser
Repository: icalendar


Branch: refs/heads/master
Date: 2020-03-04T17:19:15+01:00
Date: 2020-03-09T11:36:26+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.releaser/commit/8e2f3d3e7003306492642c0442962261beee477b
Commit: https://github.com/collective/icalendar/commit/c65c6b7e3fa0c4e0686de1163427fe5626cec34e

Ask before pushing an updated version when running 'report'.
Fixed error in tests with duplicate parameter 'self'.

Fixes https://github.com/plone/plone.releaser/issues/32
TypeError: __init__() got multiple values for argument 'self'
https://travis-ci.org/collective/icalendar/jobs/659260349

Files changed:
A news/32.bugfix
M plone/releaser/package.py
M src/icalendar/tests/hypothesis/test_fuzzing.py

b'diff --git a/news/32.bugfix b/news/32.bugfix\nnew file mode 100644\nindex 0000000..2b7e43f\n--- /dev/null\n+++ b/news/32.bugfix\n@@ -0,0 +1 @@\n+Ask before pushing an updated version when running \'report\'. [maurits]\ndiff --git a/plone/releaser/package.py b/plone/releaser/package.py\nindex b7d06fd..705228a 100644\n--- a/plone/releaser/package.py\n+++ b/plone/releaser/package.py\n@@ -277,4 +277,6 @@ def update_version(self, tag):\n versions_path = os.path.join(os.getcwd(), "versions.cfg")\n core_repo.git.add(versions_path)\n core_repo.git.commit(message="{0}={1}".format(self.name, tag))\n- core_repo.git.push()\n+ if confirm("Ok to push coredev?", default=True, skip=not self.interactive):\n+ print("Pushing changes to server.")\n+ core_repo.git.push()\n'
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: plone.releaser
Repository: icalendar


Branch: refs/heads/master
Date: 2020-03-05T01:34:33+01:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/plone.releaser/commit/242fdf92ec880597db29bc64a4810d9f11d1a753
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:
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 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: icalendar


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

Merge pull request #33 from plone/maurits/issue-32-push-ask
Merge pull request #309 from collective/maurits/improve-testing

Ask before pushing an updated version when running 'report'.
Maurits/improve testing

Files changed:
A news/32.bugfix
M plone/releaser/package.py
M src/icalendar/tests/hypothesis/test_fuzzing.py

b'diff --git a/news/32.bugfix b/news/32.bugfix\nnew file mode 100644\nindex 0000000..2b7e43f\n--- /dev/null\n+++ b/news/32.bugfix\n@@ -0,0 +1 @@\n+Ask before pushing an updated version when running \'report\'. [maurits]\ndiff --git a/plone/releaser/package.py b/plone/releaser/package.py\nindex b7d06fd..705228a 100644\n--- a/plone/releaser/package.py\n+++ b/plone/releaser/package.py\n@@ -277,4 +277,6 @@ def update_version(self, tag):\n versions_path = os.path.join(os.getcwd(), "versions.cfg")\n core_repo.git.add(versions_path)\n core_repo.git.commit(message="{0}={1}".format(self.name, tag))\n- core_repo.git.push()\n+ if confirm("Ok to push coredev?", default=True, skip=not self.interactive):\n+ print("Pushing changes to server.")\n+ core_repo.git.push()\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 b65fdd4

Please sign in to comment.