You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2020/10/12 22:40:31 UTC
[GitHub] [beam] robertwb opened a new pull request #13077: [BEAM-9561] Dataframe test infrastructure improvements.
robertwb opened a new pull request #13077:
URL: https://github.com/apache/beam/pull/13077
* Unset variables from failed assignments.
* Better parsing of multi-line examples.
* Track line numbers in test parsing.
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] [**Choose reviewer(s)**](https://beam.apache.org/contribute/#make-your-change) and mention them in a comment (`R: @username`).
- [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
- [ ] Update `CHANGES.md` with noteworthy changes.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/#make-reviewers-job-easier).
Post-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
Lang | SDK | Dataflow | Flink | Samza | Spark | Twister2
--- | --- | --- | --- | --- | --- | ---
Go | [](https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/) | ---
Java | [](https://ci-beam.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Twister2/lastCompletedBuild/)
Python | [](https://ci-beam.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python38/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python_PVR_Flink_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/) | ---
XLang | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Direct/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/) | ---
Pre-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
--- |Java | Python | Go | Website | Whitespace | Typescript
--- | --- | --- | --- | --- | --- | ---
Non-portable | [](https://ci-beam.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocker_Cron/lastCompletedBuild/) <br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocs_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Whitespace_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Typescript_Cron/lastCompletedBuild/)
Portable | --- | [](https://ci-beam.apache.org/job/beam_PreCommit_Portable_Python_Cron/lastCompletedBuild/) | --- | --- | --- | ---
See [.test-infra/jenkins/README](https://github.com/apache/beam/blob/master/.test-infra/jenkins/README.md) for trigger phrase, status and link of all Jenkins jobs.
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
[](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] robertwb commented on pull request #13077: [BEAM-9561] Dataframe test infrastructure improvements.
Posted by GitBox <gi...@apache.org>.
robertwb commented on pull request #13077:
URL: https://github.com/apache/beam/pull/13077#issuecomment-707383728
R: @tysonjh
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] robertwb merged pull request #13077: [BEAM-9561] Dataframe test infrastructure improvements.
Posted by GitBox <gi...@apache.org>.
robertwb merged pull request #13077:
URL: https://github.com/apache/beam/pull/13077
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] robertwb commented on a change in pull request #13077: [BEAM-9561] Dataframe test infrastructure improvements.
Posted by GitBox <gi...@apache.org>.
robertwb commented on a change in pull request #13077:
URL: https://github.com/apache/beam/pull/13077#discussion_r512927942
##########
File path: sdks/python/apache_beam/dataframe/doctests.py
##########
@@ -502,31 +512,33 @@ def is_example_line(line):
IMPORT_PANDAS = 'import pandas as pd'
example_srcs = []
- lines = iter(
- [line.rstrip()
- for line in rst.split('\n') if is_example_line(line)] + ['END'])
+ lines = iter([(lineno, line.rstrip()) for lineno,
+ line in enumerate(rst.split('\n')) if is_example_line(line)] +
+ [(None, 'END')])
# https://ipython.readthedocs.io/en/stable/sphinxext.html
- line = next(lines)
+ lineno, line = next(lines)
while True:
if line == 'END':
break
if line.startswith('.. ipython::'):
- line = next(lines)
+ lineno, line = next(lines)
indent = get_indent(line)
example = []
- example_srcs.append(example)
+ example_srcs.append((lineno, example))
while get_indent(line) >= indent:
if '@verbatim' in line or ':verbatim:' in line or '@savefig' in line:
example_srcs.pop()
break
+ line = re.sub(r'In \[\d+\]: ', '', line)
+ line = re.sub(r'\.\.\.+:', '', line)
Review comment:
This is correct, there may not be whitespace following this colon in all cases (but if there is, it's fine to include it as part of the indentation). This is different than the initial prompt.
##########
File path: sdks/python/apache_beam/dataframe/doctests_test.py
##########
@@ -212,13 +228,21 @@ def test_not_implemented_followed_by_name_error(self):
self.assertEqual(result.attempted, 6)
self.assertEqual(result.failed, 1) # Only the very last one.
+ def test_failed_assignment(self):
+ result = doctests.teststring(
+ FAILED_ASSIGNMENT,
+ optionflags=doctest.ELLIPSIS,
+ not_implemented_ok=True)
+ self.assertNotEqual(result.attempted, 0)
+ self.assertEqual(result.failed, 0)
+
def test_rst_ipython(self):
try:
import IPython
except ImportError:
raise unittest.SkipTest('IPython not available')
result = doctests.test_rst_ipython(RST_IPYTHON, 'test_rst_ipython')
- self.assertEqual(result.attempted, 5)
+ self.assertEqual(result.attempted, 8)
Review comment:
I added
```
foo(
4
)
```
plus the re-definition of foo and another invocation `foo(5)`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] tysonjh commented on a change in pull request #13077: [BEAM-9561] Dataframe test infrastructure improvements.
Posted by GitBox <gi...@apache.org>.
tysonjh commented on a change in pull request #13077:
URL: https://github.com/apache/beam/pull/13077#discussion_r512191138
##########
File path: sdks/python/apache_beam/dataframe/doctests.py
##########
@@ -502,31 +512,33 @@ def is_example_line(line):
IMPORT_PANDAS = 'import pandas as pd'
example_srcs = []
- lines = iter(
- [line.rstrip()
- for line in rst.split('\n') if is_example_line(line)] + ['END'])
+ lines = iter([(lineno, line.rstrip()) for lineno,
+ line in enumerate(rst.split('\n')) if is_example_line(line)] +
+ [(None, 'END')])
# https://ipython.readthedocs.io/en/stable/sphinxext.html
- line = next(lines)
+ lineno, line = next(lines)
while True:
if line == 'END':
break
if line.startswith('.. ipython::'):
- line = next(lines)
+ lineno, line = next(lines)
indent = get_indent(line)
example = []
- example_srcs.append(example)
+ example_srcs.append((lineno, example))
while get_indent(line) >= indent:
if '@verbatim' in line or ':verbatim:' in line or '@savefig' in line:
example_srcs.pop()
break
+ line = re.sub(r'In \[\d+\]: ', '', line)
+ line = re.sub(r'\.\.\.+:', '', line)
Review comment:
This regex lacks a whitespace after the colon. Not sure if it matters.
##########
File path: sdks/python/apache_beam/dataframe/doctests_test.py
##########
@@ -212,13 +228,21 @@ def test_not_implemented_followed_by_name_error(self):
self.assertEqual(result.attempted, 6)
self.assertEqual(result.failed, 1) # Only the very last one.
+ def test_failed_assignment(self):
+ result = doctests.teststring(
+ FAILED_ASSIGNMENT,
+ optionflags=doctest.ELLIPSIS,
+ not_implemented_ok=True)
+ self.assertNotEqual(result.attempted, 0)
+ self.assertEqual(result.failed, 0)
+
def test_rst_ipython(self):
try:
import IPython
except ImportError:
raise unittest.SkipTest('IPython not available')
result = doctests.test_rst_ipython(RST_IPYTHON, 'test_rst_ipython')
- self.assertEqual(result.attempted, 5)
+ self.assertEqual(result.attempted, 8)
Review comment:
Why did this change? There still seem to be only 5 ipython statements in the `RST_IPYTHON` rst.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] tysonjh commented on a change in pull request #13077: [BEAM-9561] Dataframe test infrastructure improvements.
Posted by GitBox <gi...@apache.org>.
tysonjh commented on a change in pull request #13077:
URL: https://github.com/apache/beam/pull/13077#discussion_r512933392
##########
File path: sdks/python/apache_beam/dataframe/doctests.py
##########
@@ -502,31 +512,33 @@ def is_example_line(line):
IMPORT_PANDAS = 'import pandas as pd'
example_srcs = []
- lines = iter(
- [line.rstrip()
- for line in rst.split('\n') if is_example_line(line)] + ['END'])
+ lines = iter([(lineno, line.rstrip()) for lineno,
+ line in enumerate(rst.split('\n')) if is_example_line(line)] +
+ [(None, 'END')])
# https://ipython.readthedocs.io/en/stable/sphinxext.html
- line = next(lines)
+ lineno, line = next(lines)
while True:
if line == 'END':
break
if line.startswith('.. ipython::'):
- line = next(lines)
+ lineno, line = next(lines)
indent = get_indent(line)
example = []
- example_srcs.append(example)
+ example_srcs.append((lineno, example))
while get_indent(line) >= indent:
if '@verbatim' in line or ':verbatim:' in line or '@savefig' in line:
example_srcs.pop()
break
+ line = re.sub(r'In \[\d+\]: ', '', line)
+ line = re.sub(r'\.\.\.+:', '', line)
Review comment:
Ack.
##########
File path: sdks/python/apache_beam/dataframe/doctests_test.py
##########
@@ -212,13 +228,21 @@ def test_not_implemented_followed_by_name_error(self):
self.assertEqual(result.attempted, 6)
self.assertEqual(result.failed, 1) # Only the very last one.
+ def test_failed_assignment(self):
+ result = doctests.teststring(
+ FAILED_ASSIGNMENT,
+ optionflags=doctest.ELLIPSIS,
+ not_implemented_ok=True)
+ self.assertNotEqual(result.attempted, 0)
+ self.assertEqual(result.failed, 0)
+
def test_rst_ipython(self):
try:
import IPython
except ImportError:
raise unittest.SkipTest('IPython not available')
result = doctests.test_rst_ipython(RST_IPYTHON, 'test_rst_ipython')
- self.assertEqual(result.attempted, 5)
+ self.assertEqual(result.attempted, 8)
Review comment:
OK, thanks. I misunderstood how counting worked here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org