diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-10 10:01:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-10 10:01:03 +0000 |
| commit | 58dbb7ae1a364ad18856a38b6f2787f13419caf1 (patch) | |
| tree | 206e8af3bb7e1133d4d6059f29e4862924e45302 /tests | |
| parent | 660afded0ff7070870939c801332bf0b87db8ca1 (diff) | |
| parent | 99d39545a68c4b9a47de87eb1f6954330a22596a (diff) | |
| download | zuul-58dbb7ae1a364ad18856a38b6f2787f13419caf1.tar.gz | |
Merge "Add an !unsafe change_message variable"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fixtures/config/inventory/git/common-config/playbooks/jinja2-message.yaml | 4 | ||||
| -rw-r--r-- | tests/unit/test_inventory.py | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/fixtures/config/inventory/git/common-config/playbooks/jinja2-message.yaml b/tests/fixtures/config/inventory/git/common-config/playbooks/jinja2-message.yaml index 834c3cbe8..cea1ffe8c 100644 --- a/tests/fixtures/config/inventory/git/common-config/playbooks/jinja2-message.yaml +++ b/tests/fixtures/config/inventory/git/common-config/playbooks/jinja2-message.yaml @@ -4,3 +4,7 @@ copy: content: "{{ zuul.message | b64decode }}" dest: "{{ zuul.executor.log_root }}/commit-message.txt" + - name: Dump commit message + copy: + content: "{{ zuul.change_message }}" + dest: "{{ zuul.executor.log_root }}/change-message.txt" diff --git a/tests/unit/test_inventory.py b/tests/unit/test_inventory.py index 5cafe2ddf..40f858624 100644 --- a/tests/unit/test_inventory.py +++ b/tests/unit/test_inventory.py @@ -417,23 +417,29 @@ class TestAnsibleInventory(AnsibleZuulTestCase): zv_path = os.path.join(build.jobdir.root, 'ansible', 'zuul_vars.yaml') with open(zv_path, 'r') as f: - zv = yaml.safe_load(f) + zv = yaml.ansible_unsafe_load(f) # TODO(corvus): zuul vars aren't really stored here anymore; # rework these tests to examine them separately. inventory['all']['vars'] = {'zuul': zv['zuul']} + # The deprecated base64 version decoded_message = base64.b64decode( inventory['all']['vars']['zuul']['message']).decode('utf-8') self.assertEqual(decoded_message, expected_message) - obtained_message = self._get_file(self.history[0], 'work/logs/commit-message.txt') + self.assertEqual(obtained_message, expected_message) + # The new !unsafe version + decoded_message = inventory['all']['vars']['zuul']['change_message'] + self.assertEqual(decoded_message, expected_message) + obtained_message = self._get_file(self.history[0], + 'work/logs/change-message.txt') self.assertEqual(obtained_message, expected_message) def test_jinja2_message_brackets(self): - self._jinja2_message("This message has {{ jinja2 }} in it ") + self._jinja2_message("This message has {{ ansible_host }} in it ") def test_jinja2_message_raw(self): self._jinja2_message("This message has {% raw %} in {% endraw %} it ") |