sanity: Use random filename for maximum path length test
PATCH 1/2 sanity: Use random filename for maximum path length test
check_create_long_filename used a fixed filename for its test files. This meant that os.remove(testfile) could fail with ENOENT if two instances were running at the same time against the same sstate directory. Using a randomly generated filename stops this from happening.
(Although it might seem unlikely, this race did appear to occur multiple times with Jenkins - presumably because the matrix jobs were all kicked off at the same time.)
--- meta/classes/sanity.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/sanity.bbclass +2 -1
@@ -175,7 +175,8 @@ def check_conf_exists(fn, data): return False def check_create_long_filename(filepath, pathname): - testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)])) + import string, random + testfile = os.path.join(filepath, ''.join(random.choice(string.ascii_letters) for x in range(200))) try: if not os.path.exists(filepath): bb.utils.mkdirhier(filepath)
Signature · 1 line
1.7.10.4
PATCH 2/2 sanity: Don't hard code value of ENAMETOOLONG
Although ENAMETOOLONG is 36 on Linux x86 and x86_64 it does isn't on other architectures so the value shouldn't be hard coded.
--- meta/classes/sanity.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/classes/sanity.bbclass +3 -2
@@ -184,8 +184,9 @@ def check_create_long_filename(filepath, pathname): f.close() os.remove(testfile) except IOError as e: - errno, strerror = e.args - if errno == 36: # ENAMETOOLONG + import errno + err, strerror = e.args + if err == errno.ENAMETOOLONG: return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname else: return "Failed to create a file in %s: %s.\n" % (pathname, strerror)
Signature · 1 line
1.7.10.4
Quoted 5 lines · Mike Crowe
check_create_long_filenameused a fixed filename for its test files. This meant thatos.remove(testfile)could fail with ENOENT if two instances were running at the same time against the same sstate directory. Using a randomly generated filename stops this from happening.
Quoted 8 lines
(Although it might seem unlikely, this race did appear to occur multiple times with Jenkins - presumably because the matrix jobs were all kicked off at the same time.)
Signed-off-by Mike Crowe <[email protected]>--- meta/classes/sanity.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
We've been puzzling over this on the project autobuilder too, although I didn't spot why, nicely found!
Cheers,
Richard
Quoted 14 lines
meta/classes/sanity.bbclass +2
-1@@ -175,7 +175,8 @@ def check_conf_exists(fn, data): return False def check_create_long_filename(filepath, pathname): - testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)])) + import string, random + testfile = os.path.join(filepath, ''.join(random.choice(string.ascii_letters) for x in range(200))) try: if not os.path.exists(filepath): bb.utils.mkdirhier(filepath)