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 2017/10/05 15:53:43 UTC

[1/2] beam git commit: Enable discovery of log_handler tests.

Repository: beam
Updated Branches:
  refs/heads/master 12e79d0a0 -> 1259ee955


Enable discovery of log_handler tests.

Also fix the one remaining bug.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5fb3aa03
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5fb3aa03
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5fb3aa03

Branch: refs/heads/master
Commit: 5fb3aa03a4f018fb54cc5b65fc74920e0b7983b3
Parents: 12e79d0
Author: Robert Bradshaw <ro...@google.com>
Authored: Wed Oct 4 17:38:43 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Thu Oct 5 08:53:30 2017 -0700

----------------------------------------------------------------------
 sdks/python/apache_beam/runners/worker/log_handler.py      | 1 +
 sdks/python/apache_beam/runners/worker/log_handler_test.py | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/5fb3aa03/sdks/python/apache_beam/runners/worker/log_handler.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/worker/log_handler.py b/sdks/python/apache_beam/runners/worker/log_handler.py
index 8691184..6d8a1d9 100644
--- a/sdks/python/apache_beam/runners/worker/log_handler.py
+++ b/sdks/python/apache_beam/runners/worker/log_handler.py
@@ -24,6 +24,7 @@ import threading
 import grpc
 
 from apache_beam.portability.api import beam_fn_api_pb2
+from apache_beam.portability.api import beam_fn_api_pb2_grpc
 
 # This module is experimental. No backwards-compatibility guarantees.
 

http://git-wip-us.apache.org/repos/asf/beam/blob/5fb3aa03/sdks/python/apache_beam/runners/worker/log_handler_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/worker/log_handler_test.py b/sdks/python/apache_beam/runners/worker/log_handler_test.py
index 9814324..d2647d0 100644
--- a/sdks/python/apache_beam/runners/worker/log_handler_test.py
+++ b/sdks/python/apache_beam/runners/worker/log_handler_test.py
@@ -100,8 +100,9 @@ def _create_test(name, num_logs):
           lambda self: self._verify_fn_log_handler(num_logs))
 
 
-if __name__ == '__main__':
-  for test_name, num_logs_entries in data.iteritems():
-    _create_test(test_name, num_logs_entries)
+for test_name, num_logs_entries in data.iteritems():
+  _create_test(test_name, num_logs_entries)
+
 
+if __name__ == '__main__':
   unittest.main()


[2/2] beam git commit: Closes #3946

Posted by ro...@apache.org.
Closes #3946


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/1259ee95
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/1259ee95
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/1259ee95

Branch: refs/heads/master
Commit: 1259ee9554dc5529d6579d4255afc0dccb1ec5dc
Parents: 12e79d0 5fb3aa0
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Thu Oct 5 08:53:31 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Thu Oct 5 08:53:31 2017 -0700

----------------------------------------------------------------------
 sdks/python/apache_beam/runners/worker/log_handler.py      | 1 +
 sdks/python/apache_beam/runners/worker/log_handler_test.py | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------