You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ro...@apache.org on 2016/12/23 04:25:06 UTC
[1/2] incubator-beam git commit: Skip the test_memory_usage test on
macos.
Repository: incubator-beam
Updated Branches:
refs/heads/python-sdk 9c37274dd -> cce2e9e52
Skip the test_memory_usage test on macos.
The underlying implementation for getting the used memory does not use standard units and varies across macos versions (bytes vs kbytes), causing Travis errors. Linux version is stable and use the documented units (kbytes).
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0d1182cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0d1182cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0d1182cd
Branch: refs/heads/python-sdk
Commit: 0d1182cd9c85267d3aa5bab1f3114ed1311a3216
Parents: 9c37274
Author: Ahmet Altay <al...@google.com>
Authored: Thu Dec 22 17:07:18 2016 -0800
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Thu Dec 22 20:23:56 2016 -0800
----------------------------------------------------------------------
sdks/python/apache_beam/pipeline_test.py | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0d1182cd/sdks/python/apache_beam/pipeline_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/pipeline_test.py b/sdks/python/apache_beam/pipeline_test.py
index 9b76129..d6925d4 100644
--- a/sdks/python/apache_beam/pipeline_test.py
+++ b/sdks/python/apache_beam/pipeline_test.py
@@ -18,6 +18,7 @@
"""Unit tests for the Pipeline class."""
import logging
+import platform
import unittest
from apache_beam.pipeline import Pipeline
@@ -187,6 +188,10 @@ class PipelineTest(unittest.TestCase):
except ImportError:
# Skip the test if resource module is not available (e.g. non-Unix os).
self.skipTest('resource module not available.')
+ if platform.mac_ver()[0]:
+ # Skip the test on macos, depending on version it returns ru_maxrss in
+ # different units.
+ self.skipTest('ru_maxrss is not in standard units.')
def get_memory_usage_in_bytes():
return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * (2 ** 10)
[2/2] incubator-beam git commit: Closes #1692
Posted by ro...@apache.org.
Closes #1692
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cce2e9e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cce2e9e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cce2e9e5
Branch: refs/heads/python-sdk
Commit: cce2e9e52c5a7b986e67d07b206825d576906b50
Parents: 9c37274 0d1182c
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Thu Dec 22 20:24:50 2016 -0800
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Thu Dec 22 20:24:50 2016 -0800
----------------------------------------------------------------------
sdks/python/apache_beam/pipeline_test.py | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------