Merge "Properly quote TXT/SPF sample data"
diff --git a/designate_tempest_plugin/data_utils.py b/designate_tempest_plugin/data_utils.py
index 46c8165..2f61d97 100644
--- a/designate_tempest_plugin/data_utils.py
+++ b/designate_tempest_plugin/data_utils.py
@@ -169,7 +169,7 @@
def rand_spf_recordset(zone_name, data=None, **kwargs):
- data = data or "v=spf1 +all"
+ data = data or '"v=spf1 +all"'
return rand_recordset_data('SPF', zone_name, records=[data], **kwargs)
@@ -193,7 +193,7 @@
def rand_txt_recordset(zone_name, data=None, **kwargs):
- data = data or "v=spf1 +all"
+ data = data or '"v=spf1 +all"'
return rand_recordset_data('TXT', zone_name, records=[data], **kwargs)
diff --git a/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json b/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json
index 26633f3..449d90c 100644
--- a/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json
+++ b/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json
@@ -1,5 +1,5 @@
{
"trailing_slash": {"data": "\\"},
"trailing_double_slash": {"data": "\\\\"},
- "trailing_slash_after_text": {"data": "v=spf1 +all\\"}
+ "trailing_slash_after_text": {"data": "testtext\\"}
}
diff --git a/designate_tempest_plugin/tests/api/v2/recordset_data.json b/designate_tempest_plugin/tests/api/v2/recordset_data.json
index 5790c54..9f365a7 100644
--- a/designate_tempest_plugin/tests/api/v2/recordset_data.json
+++ b/designate_tempest_plugin/tests/api/v2/recordset_data.json
@@ -47,6 +47,6 @@
"TXT": {
"name": "www",
"type": "TXT",
- "records": ["Any Old Text Goes Here"]
+ "records": ["\"Any Old Text Goes Here\""]
}
}
diff --git a/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json b/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
index dedf414..c56727d 100644
--- a/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
+++ b/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
@@ -33,21 +33,21 @@
"SPF at APEX": {
"name": "*",
"type": "SPF",
- "records": ["v=spf1; a -all"]
+ "records": ["\"v=spf1; a -all\""]
},
"SPF under APEX": {
"name": "*.sub",
"type": "SPF",
- "records": ["v=spf1; a -all"]
+ "records": ["\"v=spf1; a -all\""]
},
"TXT at APEX": {
"name": "*",
"type": "TXT",
- "records": ["Can you read me?"]
+ "records": ["\"Can you read me?\""]
},
"TXT under APEX": {
"name": "*.sub",
"type": "TXT",
- "records": ["Can you read me?"]
+ "records": ["\"Can you read me?\""]
}
}
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py b/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
index c7962f6..36c68ff 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
@@ -134,7 +134,7 @@
self.assertRaisesDns(
exceptions.BadRequest, 'invalid_object', 400,
self.recordset_client.create_recordset,
- self.zone['id'], post_model,
+ self.zone['id'], post_model
)
@decorators.idempotent_id('03e4f811-0c37-4ce2-8b16-662c824f8f18')
diff --git a/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json b/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json
index b54b1b3..3abcf10 100644
--- a/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json
+++ b/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json
@@ -1,5 +1,5 @@
{
- "slash_with_one_trailing_space": {"data": "\\ "},
- "slash_with_many_trailing_space": {"data": "\\ "},
- "text_with_slash_and_trailing_space": {"data": "the txts "}
+ "slash_with_one_trailing_space": {"data": "\"\\ \""},
+ "slash_with_many_trailing_space": {"data": "\"\\ \""},
+ "text_with_slash_and_trailing_space": {"data": "\"the txts \""}
}
diff --git a/designate_tempest_plugin/tests/base.py b/designate_tempest_plugin/tests/base.py
index f4f50de..6d33d81 100644
--- a/designate_tempest_plugin/tests/base.py
+++ b/designate_tempest_plugin/tests/base.py
@@ -22,7 +22,7 @@
CONF = config.CONF
-class AssertRaisesDns(object):
+class AssertRaisesDns(test.BaseTestCase):
def __init__(self, test_class, exc, type_, code):
self.test_class = test_class
self.exc = exc