From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 22 Nov 2018 11:59:58 +0000 (+0000)
Subject: bitbake: tests/fetch: Update after recent gitsm message changes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c5e19c96d77db139206b58a8aaa960b38009452;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: tests/fetch: Update after recent gitsm message changes

Also use assetIn instead of assertTrue which aids debugging failures.

(Bitbake rev: 19dee675bb9ad012d28e1e57a888931355a831cb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 17909ec62c3..6848095cfd6 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -1708,9 +1708,8 @@ class GitShallowTest(FetcherTest):
         with self.assertRaises(bb.fetch2.UnpackError) as context:
             fetcher.unpack(self.d.getVar('WORKDIR'))
 
-        self.assertTrue("No up to date source found" in context.exception.msg)
-        self.assertTrue("clone directory not available or not up to date" in context.exception.msg)
-        self.assertTrue("shallow clone not enabled or not available" in context.exception.msg)
+        self.assertIn("No up to date source found", context.exception.msg)
+        self.assertIn("clone directory not available or not up to date", context.exception.msg)
 
     @skipIfNoNetwork()
     def test_that_unpack_does_work_when_using_git_shallow_tarball_but_tarball_is_not_available(self):