Fix test_host_name_is_same_as_server_name

Some images will add postfix for the hostname, e.g.,
if hostname is "aaa", postfix ".novalocal" may be added
to it, and the hostname will be "aaa.novalocal" then, so
we should ignore the postfix when checking whether hostname
equals self.name.

Change-Id: Ie3d603875c029ca705ee58e0f4e9d11950f509aa
Closes-Bug: #1755398
This commit is contained in:
zhufl 2018-03-13 16:02:50 +08:00
parent 1525e67d7b
commit 4b1b9dff58
1 changed files with 7 additions and 2 deletions

View File

@ -135,8 +135,13 @@ class ServersTestJSON(base.BaseV2ComputeTest):
servers_client=self.client)
hostname = linux_client.exec_command("hostname").rstrip()
msg = ('Failed while verifying servername equals hostname. Expected '
'hostname "%s" but got "%s".' % (self.name, hostname))
self.assertEqual(self.name.lower(), hostname, msg)
'hostname "%s" but got "%s".' %
(self.name, hostname.split(".")[0]))
# NOTE(zhufl): Some images will add postfix for the hostname, e.g.,
# if hostname is "aaa", postfix ".novalocal" may be added to it, and
# the hostname will be "aaa.novalocal" then, so we should ignore the
# postfix when checking whether hostname equals self.name.
self.assertEqual(self.name.lower(), hostname.split(".")[0], msg)
class ServersTestManualDisk(ServersTestJSON):