From 32eacb46225a5d8952088c1b8d5705dd0a252157 Mon Sep 17 00:00:00 2001 From: Assaf Giladi Date: Tue, 19 Nov 2019 18:06:06 +0200 Subject: [PATCH 1/3] talker.agent: run agent with python3 --- .travis.yml | 2 +- talker_agent/Dockerfile | 2 +- talker_agent/talker.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e71156..9632b79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: env: - TEST_SUITE="tests/uts/test_client.py" - stage: agent unit tests - python: 2.7 + python: 3.5 env: - TEST_SUITE="tests/uts/test_agent.py" - stage: integration tests diff --git a/talker_agent/Dockerfile b/talker_agent/Dockerfile index a93aa7e..027048c 100644 --- a/talker_agent/Dockerfile +++ b/talker_agent/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7-slim-buster +FROM python:3.5-slim-buster #args from docker-compose.yaml ARG TALKER_AGENT_VERSION diff --git a/talker_agent/talker.py b/talker_agent/talker.py index 580e1da..76eefdd 100644 --- a/talker_agent/talker.py +++ b/talker_agent/talker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/local/bin/python3 """ From 9fce18adb761dad8d013a06f88aa2808fac752dd Mon Sep 17 00:00:00 2001 From: Assaf Giladi Date: Wed, 20 Nov 2019 12:17:19 +0200 Subject: [PATCH 2/3] talker.agent: encode stderr exception --- talker_agent/talker.py | 2 +- tests/integration/test_sanity.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/talker_agent/talker.py b/talker_agent/talker.py index 76eefdd..189376b 100644 --- a/talker_agent/talker.py +++ b/talker_agent/talker.py @@ -304,7 +304,7 @@ def start(self): time.sleep(random.random() * 2) continue - self.stderr.chunks.append(e.strerror) + self.stderr.chunks.append(e.strerror.encode('utf-8')) self.set_result(e.errno) self.finalize() return diff --git a/tests/integration/test_sanity.py b/tests/integration/test_sanity.py index 112939d..7378c2c 100644 --- a/tests/integration/test_sanity.py +++ b/tests/integration/test_sanity.py @@ -1,7 +1,7 @@ import unittest from talker_agent.talker import Config -from talker.errors import CommandAbortedByOverflow +from talker.errors import CommandAbortedByOverflow, CommandExecutionError from tests.utils import get_talker_client, get_retcode, get_stdout @@ -38,3 +38,8 @@ def test_max_output_per_channel_set(self): if expected_ret == 0: res = get_stdout(self.client.redis, cmd.job_id) self.assertEqual(res, val) + + def test_bad_command(self): + cmd = self.client.run(self.host_id, 'foo') + with self.assertRaises(CommandExecutionError): + cmd.result() From e8ffbba3c9b307f194c6a4b51281be5c8598addc Mon Sep 17 00:00:00 2001 From: Assaf Giladi Date: Wed, 20 Nov 2019 12:19:39 +0200 Subject: [PATCH 3/3] changelog: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4b2702..e8d5ba0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- upgrade agent to run with python3 ## [1.8.6] - 2019-11-05 ### Added