Revert "selftest/lic_checksum: Add test for filename containing space"

This reverts commit 61a5923cce415648ca4d19bc262397d4bbcd32c9.

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 424ce6e3b9e064d2f38cf03b81aa31071fa2f6cb..b7869da3b38f8a5cbdb355930b71fac0613225b4 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -94,8 +94,6 @@ def extra_path_elements(d):
 PATH:prepend = "${@extra_path_elements(d)}"
 
 def get_lic_checksum_file_list(d):
-    import urllib
-
     filelist = []
     lic_files = d.getVar("LIC_FILES_CHKSUM") or ''
     tmpdir = d.getVar("TMPDIR")
@@ -115,7 +113,7 @@ def get_lic_checksum_file_list(d):
             if path[0] == '/':
                 if path.startswith((tmpdir, s, b, workdir)):
                     continue
-                filelist.append(urllib.parse.quote(path) + ":" + str(os.path.exists(path)))
+                filelist.append(path + ":" + str(os.path.exists(path)))
         except bb.fetch.MalformedUrl:
             bb.fatal(d.getVar('PN') + ": LIC_FILES_CHKSUM contains an invalid URL: " + url)
     return " ".join(filelist)

diff --git a/meta/lib/oeqa/selftest/cases/lic_checksum.py b/meta/lib/oeqa/selftest/cases/lic_checksum.py
index 6bdbac3ba2a6fa68ecf01bdd0027facabae23e97..91021ac335062e34db01099aeb7370626dc6aaf8 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/lic_checksum.py
+++ b/meta/lib/oeqa/selftest/cases/lic_checksum.py
@@ -4,7 +4,6 @@
 
 import os
 import tempfile
-import urllib
 
 from oeqa.selftest.case import OESelftestTestCase
 from oeqa.utils.commands import bitbake
@@ -12,23 +11,6 @@ from oeqa.utils import CommandError
 
 class LicenseTests(OESelftestTestCase):
 
-    def test_checksum_with_space(self):
-        bitbake_cmd = '-c populate_lic emptytest'
-
-        lic_file, lic_path = tempfile.mkstemp(" -afterspace")
-        os.close(lic_file)
-        #self.track_for_cleanup(lic_path)
-
-        self.write_config("INHERIT:remove = \"report-error\"")
-
-        self.write_recipeinc('emptytest', """
-INHIBIT_DEFAULT_DEPS = "1"
-LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
-SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
-""" % (urllib.parse.quote(lic_path), urllib.parse.quote(lic_path)))
-        result = bitbake(bitbake_cmd)
-
-
     # Verify that changing a license file that has an absolute path causes
     # the license qa to fail due to a mismatched md5sum.
     def test_nonmatching_checksum(self):