From 6d1ba411e6fe1b3c9f0980f437c6fd5c0dcd4148 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 6 Jun 2019 10:03:11 -0400 Subject: [PATCH] make activity stream action_node deterministic for Swagger docs --- Makefile | 2 +- awx/main/tests/docs/test_swagger_generation.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6083c7a9c6..c7f2f07935 100644 --- a/Makefile +++ b/Makefile @@ -345,7 +345,7 @@ pylint: reports @(set -o pipefail && $@ | reports/$@.report) genschema: reports - $(MAKE) swagger PYTEST_ARGS="--genschema" + $(MAKE) swagger PYTEST_ARGS="--genschema --create-db " mv swagger.json schema.json swagger: reports diff --git a/awx/main/tests/docs/test_swagger_generation.py b/awx/main/tests/docs/test_swagger_generation.py index 287b4d0ad1..9f00193515 100644 --- a/awx/main/tests/docs/test_swagger_generation.py +++ b/awx/main/tests/docs/test_swagger_generation.py @@ -176,4 +176,9 @@ class TestSwaggerGeneration(): r'\1xxxx\3', data ) + data = re.sub( + r'"action_node": "awx-[^"]+"', + '"action_node": "awx"', + data + ) f.write(data)