Ensure the packed version of protobuf is used on bot tests.

Ensure the packed version of protobuf is used on bot tests.

R=dsansome@chromium.org
BUG=701274
Review-Url: https://codereview.chromium.org/2751863003
Committed: https://github.com/luci/luci-py/commit/53b10321d15331637c0510fc4215861bc398ed69

[M-A Ruel, 2017-03-15 13:15:54]

If you could try locally to confirm this would be appreciated.

[dsansome, 2017-03-17 01:54:56]

lgtm

Works for me with the 2 changes below.  Thanks for fixing this!

https://codereview.chromium.org/2751863003/diff/1/appengine/swarming/swarming...
File appengine/swarming/swarming_bot/test_env_bot.py (right):

https://codereview.chromium.org/2751863003/diff/1/appengine/swarming/swarming...
appengine/swarming/swarming_bot/test_env_bot.py:66: protobuf_pkg =
os.path.join(client, 'third_party', 'protobuf', 'google')
This should just be os.path.join(client, 'third_party', 'google')

https://codereview.chromium.org/2751863003/diff/1/appengine/swarming/swarming...
appengine/swarming/swarming_bot/test_env_bot.py:68:
google.__path__.append(protobuf_pkg)
This needs to be insert(0, ...)

[M-A Ruel, 2017-03-24 20:12:53]

Sorry for the delay, finally fixed and committing.

https://codereview.chromium.org/2751863003/diff/1/appengine/swarming/swarming...
File appengine/swarming/swarming_bot/test_env_bot.py (right):

https://codereview.chromium.org/2751863003/diff/1/appengine/swarming/swarming...
appengine/swarming/swarming_bot/test_env_bot.py:66: protobuf_pkg =
os.path.join(client, 'third_party', 'protobuf', 'google')
On 2017/03/17 01:54:55, dsansome wrote:
> This should just be os.path.join(client, 'third_party', 'google')

Done.

https://codereview.chromium.org/2751863003/diff/1/appengine/swarming/swarming...
appengine/swarming/swarming_bot/test_env_bot.py:68:
google.__path__.append(protobuf_pkg)
On 2017/03/17 01:54:55, dsansome wrote:
> This needs to be insert(0, ...)

Done.

[M-A Ruel, 2017-03-24 20:13:02]

The CQ bit was checked by maruel@chromium.org

[M-A Ruel, 2017-03-24 20:13:02]

The patchset sent to the CQ was uploaded after l-g-t-m from
dsansome@chromium.org
Link to the patchset: https://codereview.chromium.org/2751863003/#ps20001
(title: "With actual fixes")

[commit-bot: I haz the power, 2017-03-24 20:13:11]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 20:17:01]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1490386382072850,
"parent_rev": "34d26ce7f3e7c59aea3f6d65292084d9768c7eaa", "commit_rev":
"53b10321d15331637c0510fc4215861bc398ed69"}

[commit-bot: I haz the power, 2017-03-24 20:17:05]

Description was changed from

==========
Ensure the packed version of protobuf is used on bot tests.

R=dsansome@chromium.org
BUG=701274
==========

to

==========
Ensure the packed version of protobuf is used on bot tests.

R=dsansome@chromium.org
BUG=701274

Review-Url: https://codereview.chromium.org/2751863003
Committed:
https://github.com/luci/luci-py/commit/53b10321d15331637c0510fc4215861bc398ed69
==========

[commit-bot: I haz the power, 2017-03-24 20:17:06]

Committed patchset #2 (id:20001) as
https://github.com/luci/luci-py/commit/53b10321d15331637c0510fc4215861bc398ed69