From 9e863a226058ebc63654be07a302fcfc4b03a610 Mon Sep 17 00:00:00 2001 From: epi052 <43392618+epi052@users.noreply.github.com> Date: Sat, 13 Jun 2020 18:55:42 -0500 Subject: [PATCH] Troublehoot pipeline tool tests (#71) * changed go version --- .github/workflows/pythonapp.yml | 2 +- pipeline/tools/go.yaml | 2 +- tests/utils.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 3f65476..ec73d1d 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -126,4 +126,4 @@ jobs: - name: Test with pytest run: | pipenv install pytest cmd2 luigi sqlalchemy python-libnmap - pipenv run python -m pytest tests/test_tools_install + pipenv run python -m pytest -vv --show-capture=all tests/test_tools_install \ No newline at end of file diff --git a/pipeline/tools/go.yaml b/pipeline/tools/go.yaml index e2335b7..9d5dea4 100644 --- a/pipeline/tools/go.yaml +++ b/pipeline/tools/go.yaml @@ -3,6 +3,6 @@ bashrc: &bashrc !join_path [!get_default "{home}", .bashrc] path: &gotool !join_path [!get_default "{goroot}", go/bin/go] commands: -- wget -q https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz -O /tmp/go.tar.gz +- wget -q https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz -O /tmp/go.tar.gz - !join [tar -C, !get_default "{goroot}", -xvf /tmp/go.tar.gz] - !join ["bash -c 'if [ ! $(grep $(dirname", *gotool, ")", *bashrc, ") ]; then echo PATH=${PATH}:$(dirname", *gotool, ") >>", *bashrc, "; fi'"] diff --git a/tests/utils.py b/tests/utils.py index b066399..1870b76 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -36,4 +36,5 @@ def run_cmd(app, cmd): out = copy_cmd_stdout.getvalue() err = copy_stderr.getvalue() + return normalize(out), normalize(err)