Merge pull request ansible#4017 from ryanpetrello/swagger-action-node

make activity stream action_node deterministic for Swagger docs Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
ShaunBoughey · Jun 6, 2019 · 176f863 · 176f863
2 parents 958c192 + 6d1ba41
commit 176f863
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -176,4 +176,9 @@ def teardown_class(cls):
                 r'\1xxxx\3',
                 data
             )
+            data = re.sub(
+                r'"action_node": "awx-[^"]+"',
+                '"action_node": "awx"',
+                data
+            )
             f.write(data)