Commit c1513c7f authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

QA: Ignore tags using regular expression



In some QA environments external scripts may add tags. With this patch a
regular expression can be used to ignore them during QA runs.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent d7772efa
......@@ -27,6 +27,9 @@
"# Script to check instance status": null,
"instance-check": null,
"# Regular expression to ignore existing tags": null,
"ignore-tags-re": null,
"nodes": [
{
"# Master node": null,
......
......@@ -25,6 +25,8 @@
import tempfile
import random
import re
import itertools
from ganeti import utils
from ganeti import constants
......@@ -416,6 +418,18 @@ def TestNode(node):
])
def _FilterTags(seq):
"""Removes unwanted tags from a sequence.
"""
ignore_re = qa_config.get("ignore-tags-re", None)
if ignore_re:
return itertools.ifilterfalse(re.compile(ignore_re).match, seq)
else:
return seq
def TestTags(kind, name, tags):
"""Tests .../tags resources.
......@@ -432,7 +446,7 @@ def TestTags(kind, name, tags):
raise errors.ProgrammerError("Unknown tag kind")
def _VerifyTags(data):
AssertEqual(sorted(tags), sorted(data))
AssertEqual(sorted(tags), sorted(_FilterTags(data)))
queryargs = "&".join("tag=%s" % i for i in tags)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment