Fix error message asserts in functional test

As a consequence of the bugfix I196c2e3dabcbf0564c1ca0bd4870dc2df3efc836
in placement some trait tests started to fail as the error message
emitted by placement has been changed.

Change-Id: I404637f09ed69fa1934e86db83ecdc2d8ef35c85
Closes-Bug: #1771761
This commit is contained in:
Balazs Gibizer 2018-05-17 09:53:33 +02:00 committed by Matt Riedemann
parent 61b08c5ac7
commit 7882ed33f3
2 changed files with 3 additions and 3 deletions

View File

@ -213,7 +213,7 @@ class BaseTestCase(base.BaseTestCase):
except subprocess.CalledProcessError as exc:
# may have already been deleted by a test case
err_message = exc.output.decode('utf-8').lower()
if 'not found' not in err_message:
if 'http 404' not in err_message:
raise
self.addCleanup(cleanup)

View File

@ -64,7 +64,7 @@ class TestTrait(base.BaseTestCase):
self.assertEqual({'name': TRAIT}, self.trait_show(TRAIT))
def test_fail_show_unknown_trait(self):
self.assertCommandFailed('Not found', self.trait_show, 'UNKNOWN')
self.assertCommandFailed('HTTP 404', self.trait_show, 'UNKNOWN')
def test_set_multiple_traits(self):
self.trait_create(TRAIT + '1')
@ -99,7 +99,7 @@ class TestTrait(base.BaseTestCase):
def test_delete_trait(self):
self.trait_create(TRAIT)
self.trait_delete(TRAIT)
self.assertCommandFailed('Not found', self.trait_show, TRAIT)
self.assertCommandFailed('HTTP 404', self.trait_show, TRAIT)
def test_fail_rp_trait_list_unknown_uuid(self):
self.assertCommandFailed(