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.

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

[3.6] bpo-30303: IDLE test_textview: add comments and test, increase coverage to… #1866

Closed
wants to merge 1 commit into from

Conversation

Mariatta
Copy link
Member

… 100% (GH-1641).

(cherry picked from commit 295304d)

@Mariatta Mariatta added the tests Tests in the Lib/test dir label May 30, 2017
@Mariatta Mariatta requested a review from terryjreedy May 30, 2017 19:46
@Mariatta Mariatta changed the title [3.6] IDLE test_textview: add comments and test, increase coverage to… [3.6] bpo-30303: IDLE test_textview: add comments and test, increase coverage to… May 30, 2017
@terryjreedy
Copy link
Member

For bpo-30303, PR 1499 was applied first and then PR 1641 on top of it. This backport of 1641 to 3.6 was prepared without a backport of 1499 having been applied to 3.6. The result was not only the overt merge conflict noted above (after I merged PR 1966, the backport of 1499) but at least one non-conflict error that I noticed. 1499 added a new class:
class ButtonClickTextViewTest(unittest.TestCase):
1641 merely added a comment and changed the name:
-class ButtonClickTextViewTest(unittest.TestCase):
+# Call TextViewer with _utest=True.
+class ButtonClickTest(unittest.TestCase):+# Call TextViewer with _utest=True.
But this PR, prepared without the new class present in the file, has a quit different diff. It adds the new class as ButtonClickTest. When merged into 3.6 with ButtonClickTextViewTest present the result is two copies of the class with different names, which is wrong.

I considered trying to fix both files by copying the 3.7 versions into 3.7, but the result commit would have included 20 other files, and at best the result would have been two 'wrong' commits to get one 'right' diff. So I think it best to redo the backport with 1499/1966 already applied.

@terryjreedy terryjreedy closed this Jun 8, 2017
@Mariatta Mariatta deleted the backport-295304d-3.6 branch June 8, 2017 15:06
@terryjreedy
Copy link
Member

The replacement backport is
#2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants