[ https://issues.apache.org/jira/browse/BEAM-5745?focusedWorklogId=158315&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-158315 ]
ASF GitHub Bot logged work on BEAM-5745: ---------------------------------------- Author: ASF GitHub Bot Created on: 24/Oct/18 21:06 Start Date: 24/Oct/18 21:06 Worklog Time Spent: 10m Work Description: tvalentyn commented on issue #6687: [BEAM-5745] Fix annotation test for py3 URL: https://github.com/apache/beam/pull/6687#issuecomment-432828218 One way to rebase your change on top of master, manually resolve merge conflict, and squash/fixup commits into 1 is via `git pull --rebase=interactive origin master`. Looking at the conflict, you'd have to resolve it manually or start over with the PR using a new branch, that has most recent code from master. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 158315) Time Spent: 3h 50m (was: 3h 40m) > Util test on annotations fails > ------------------------------- > > Key: BEAM-5745 > URL: https://issues.apache.org/jira/browse/BEAM-5745 > Project: Beam > Issue Type: Sub-task > Components: sdk-py-core > Reporter: Ruoyun Huang > Assignee: Ruoyun Huang > Priority: Minor > Time Spent: 3h 50m > Remaining Estimate: 0h > > Traceback (most recent call last): > File > "/usr/local/google/home/ruoyun/projects/beam/sdks/python/apache_beam/utils/annotations_test.py", > line 142, in test_frequency > label_check_list=[]) > File > "/usr/local/google/home/ruoyun/projects/beam/sdks/python/apache_beam/utils/annotations_test.py", > line 149, in check_annotation > self.assertIn(fnc_name + ' is ' + annotation_type, > str(warning[-1].message)) > AssertionError: 'fnc2_test_annotate_frequency is experimental' not found in > 'fnc_test_annotate_frequency is experimental.' -- This message was sent by Atlassian JIRA (v7.6.3#76005)