Skip to contentSkip to conversation

eSDK.py: avoid error in tearDownClass due to race condistion

PATCH New Chen Qi 1 participant 2 messages Jan 24, 2019

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover eSDK.py: avoid error in tearDownClass due to race condistion

*** BLURB HERE ***
The following changes since commit ba0b32ebc3520c367915657b8fb8878be5bfde92:

remove unused distutils-tools.bbclass (2019-01-23 07:57:07 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/eSDK-race
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/eSDK-race

Chen Qi (1):
eSDK.py: avoid error in tearDownClass due to race condistion

 meta/lib/oeqa/selftest/cases/eSDK.py | 6 ++++++
 1 file changed, 6 insertions(+)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 eSDK.py: avoid error in tearDownClass due to race condistion

When removing the temporary directory, it's possible that bitbake.lock file is removed by bitbake during the cleanup. And this leads to the following error.

FileNotFoundError: [Errno 2] No such file or directory: 'bitbake.lock'

So add a check to remove this file before cleaning up the temporary directory.

---
 meta/lib/oeqa/selftest/cases/eSDK.py | 6 ++++++
 1 file changed, 6 insertions(+)
meta/lib/oeqa/selftest/cases/eSDK.py +6 -0
index d7aef93..8e3a43d 100644
@@ -2,6 +2,7 @@ import tempfile
 import shutil
 import os
 import glob
+import time
 from oeqa.core.decorator.oeid import OETestID
 from oeqa.selftest.case import OESelftestTestCase
 from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
@@ -95,6 +96,11 @@ SSTATE_MIRRORS =  "file://.* file://%s/PATH"
 
     @classmethod
     def tearDownClass(cls):
+        for i in range(0, 10):
+            if os.path.exists(os.path.join(cls.tmpdir_eSDKQA, 'bitbake.lock')):
+                time.sleep(1)
+            else:
+                break
         cls.tmpdirobj.cleanup()
         super().tearDownClass()
 
Signature · 1 line
1.9.1