jenkins-bot has submitted this change and it was merged.

Change subject: [FIX] tests: Don't do hostname check if net=False ......................................................................

[FIX] tests: Don't do hostname check if net=False

When using net=False it shouldn't do any hostname checks as the test is intended to be run without any network activity. This only affects tests which also have a site defined (e.g. using dry=True) as CheckHostnameMixin wouldn't check if no hostname or sites are defined.

Also verifies that net is not False when only hostnames (and not sites) are defined as hostnames is only there for hostname checks.

Change-Id: Ic60d6d24b489bf63284164411ad5cf1d4ba2ece6 --- M tests/aspects.py 1 file changed, 4 insertions(+), 1 deletion(-)

Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/aspects.py b/tests/aspects.py index 4c09d1c..11890d8 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -786,7 +786,10 @@ if 'cached' in dct and dct['cached']: bases = tuple([ForceCacheMixin] + list(bases))

- bases = tuple([CheckHostnameMixin] + list(bases)) + if 'net' in dct and dct['net']: + bases = tuple([CheckHostnameMixin] + list(bases)) + else: + assert not hostnames, 'net must be True with hostnames defined'

if 'write' in dct and dct['write']: if 'user' not in dct: