[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5734/8267] selftest/bbtests: improve download rename test

[Emmanuele Bassi <ebassi src gnome org>]

commit 1bc292fe253176963f304ed027e3ed32b00549b6
Author: Ross Burton <ross burton intel com>
Date:   Sun Apr 23 21:29:39 2017 +0100

    selftest/bbtests: improve download rename test
    
    This test was assuming the format of SRC_URI so broke when SRC_URI was changed.
    Fix the test by hardcoding a complete SRC_URI instead of appending and hoping
    for the best.
    
    (From OE-Core rev: afe1d3073a435ef6c838cc676748842af4c4af83)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/bbtests.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index d073433..46e09f5 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -151,15 +151,16 @@ doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result
 
     @testcase(171)
     def test_rename_downloaded_file(self):
+        # TODO unique dldir instead of using cleanall
+        # TODO: need to set sstatedir?
         self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
 SSTATE_DIR = \"${TOPDIR}/download-selftest\"
 """)
         self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
 
-        data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"'
+        data = 'SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz;downloadfilename=test-aspell.tar.gz"'
         self.write_recipeinc('aspell', data)
-        bitbake('-ccleanall aspell')
-        result = bitbake('-c fetch aspell', ignore_status=True)
+        result = bitbake('-f -c fetch aspell', ignore_status=True)
         self.delete_recipeinc('aspell')
         self.assertEqual(result.status, 0, msg = "Couldn't fetch aspell. %s" % result.output)
         dl_dir = get_bb_var("DL_DIR")