Attachment 9996 Details for Bug 41005

[patch] qa.diff

qa.diff (text/plain), 2.10 KB, created by Arvid Requate on 2019-04-29 19:51 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2019-04-29 19:51 CEST

Size: 2.10 KB

patch

obsolete

>diff --git a/services/univention-bind/bind.py b/services/univention-bind/bind.py
>index 5d420f382f..33cfc3825a 100755
>--- a/services/univention-bind/bind.py
>+++ b/services/univention-bind/bind.py
>@@ -104,30 +104,30 @@ def validate_zonename(zonename):
> 	'foo'
> 	>>> validate_zonename('foo.bar')
> 	'foo.bar'
>-	>>> validate_zonename('foo.zone')  # doctest: +IGNORE_EXCEPTION_DETAIL
>+	>>> validate_zonename('foo.zone')  # doctest: +ELLIPSIS
> 	Traceback (most recent call last):
> 	...
>-	InvalidZone:
>-	>>> validate_zonename('foo.proxy')  # doctest: +IGNORE_EXCEPTION_DETAIL
>+	InvalidZone: ...
>+	>>> validate_zonename('foo.proxy')  # doctest: +ELLIPSIS
> 	Traceback (most recent call last):
> 	...
>-	InvalidZone:
>-	>>> validate_zonename('.')  # doctest: +IGNORE_EXCEPTION_DETAIL
>+	InvalidZone: ...
>+	>>> validate_zonename('.')  # doctest: +ELLIPSIS
> 	Traceback (most recent call last):
> 	...
>-	InvalidZone:
>-	>>> validate_zonename('..')  # doctest: +IGNORE_EXCEPTION_DETAIL
>+	InvalidZone: ...
>+	>>> validate_zonename('..')  # doctest: +ELLIPSIS
> 	Traceback (most recent call last):
> 	...
>-	InvalidZone:
>-	>>> validate_zonename('fo..o')  # doctest: +IGNORE_EXCEPTION_DETAIL
>+	InvalidZone: ...
>+	>>> validate_zonename('fo..o')  # doctest: +ELLIPSIS
> 	Traceback (most recent call last):
> 	...
>-	InvalidZone:
>-	>>> validate_zonename('fo"bar"o')  # doctest: +IGNORE_EXCEPTION_DETAIL
>+	InvalidZone: ...
>+	>>> validate_zonename('fo"bar"o')  # doctest: +ELLIPSIS
> 	Traceback (most recent call last):
> 	...
>-	InvalidZone:
>+	InvalidZone: ...
> 	"""
> 	if not zonename:
> 		raise InvalidZone('empty zonename not allowed')
>@@ -135,7 +135,7 @@ def validate_zonename(zonename):
> 		raise InvalidZone('zone name %r contains invalid characters' % (zonename,))
> 	if zonename.endswith('.zone') or zonename.endswith('.proxy'):
> 		raise InvalidZone('.zone or .proxy TLD are not supported.')
>-	if '..' in zonename or zonename in ('.', '..'):
>+	if '..' in zonename or zonename == '.':
> 		raise InvalidZone('zone name must not be ".", ".." or contain "..".')
> 	if zonename in ('0.in-addr.arpa', '127.in-addr.arpa', '255.in-addr.arpa'):
> 		raise InvalidZone('zone must not be 0, 127, 255.')

Actions: View | Diff

Attachments on bug 41005: 7788 | 9117 | 9118 | 9996