From 756d56a323885eb0d6c25d61f8bde10006162060 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 5 Jan 2021 00:09:26 +0900 Subject: [PATCH] Use policy.yaml in tests This change replaces the usage of policy.json by policy.yaml in test codes, because Gnocchi service now uses policy.yaml by default. --- gnocchi/tests/base.py | 2 +- gnocchi/tests/functional/fixtures.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnocchi/tests/base.py b/gnocchi/tests/base.py index 21c5c0236..3cb9a46c5 100644 --- a/gnocchi/tests/base.py +++ b/gnocchi/tests/base.py @@ -315,7 +315,7 @@ def setUp(self): os.path.join(py_root, 'rest', 'api-paste.ini'), group="api") self.conf.set_override('policy_file', - os.path.join(py_root, 'rest', 'policy.json'), + os.path.join(py_root, 'rest', 'policy.yaml'), group="oslo_policy") # NOTE(jd) This allows to test S3 on AWS diff --git a/gnocchi/tests/functional/fixtures.py b/gnocchi/tests/functional/fixtures.py index 7585ae2f9..dd098a0cb 100644 --- a/gnocchi/tests/functional/fixtures.py +++ b/gnocchi/tests/functional/fixtures.py @@ -111,7 +111,7 @@ def start_fixture(self): os.path.join(py_root, 'rest', 'api-paste.ini'), group="api") conf.set_override('policy_file', - os.path.join(py_root, 'rest', 'policy.json'), + os.path.join(py_root, 'rest', 'policy.yaml'), group="oslo_policy") # NOTE(sileht): This is not concurrency safe, but only this tests file