Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 06:09:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1799717: Adding a try/catch block in the test to exempt some known possible failures.r=jari

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D210174
This commit is contained in:
Harveer Singh 2024-05-13 21:07:26 +00:00
parent 53feb735aa
commit 0d04df1c2a
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dom/cache/test/marionette/test_caches_delete_cleanup_after_shutdown.py vendored
View File

@ -3,6 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import os
import time
from marionette_driver import Wait
from marionette_harness import MarionetteTestCase
@ -77,26 +78,43 @@ class CachesDeleteCleanupAtShutdownTestCase(MarionetteTestCase):
script_args=(CACHE_ID,),
)
# asynchronously iterating over body files could be challenging as firefox
# might be doing some cleanup while we are iterating over it's morgue dir.
# It's expected for this helper to throw FileNotFoundError exception in
# such cases.
def fallibleCountBodies(self, morgueDir):
bodyCount = 0
for elem in os.listdir(morgueDir):
absPathElem = os.path.join(morgueDir, elem)
if os.path.isdir(absPathElem):
bodyCount += sum(
1
for e in os.listdir(absPathElem)
if os.path.isfile(os.path.join(absPathElem, e))
)
return bodyCount
def countBodies(self):
profile = self.marionette.instance.profile.profile
originDir = (
self.marionette.absolute_url("")[:-1].replace(":", "+").replace("/", "+")
)
morgueDir = f"{profile}/storage/default/{originDir}/cache/morgue"
print("morgueDir path = ", morgueDir)
bodyCount = -1
if os.path.exists(morgueDir):
bodyCount = 0
for elem in os.listdir(morgueDir):
absPathElem = os.path.join(morgueDir, elem)
if os.path.isdir(absPathElem):
bodyCount += sum(
1
for e in os.listdir(absPathElem)
if os.path.isfile(os.path.join(absPathElem, e))
)
return bodyCount
if not os.path.exists(morgueDir):
print("morgue directory does not exists.")
return -1
while True:
try:
return self.fallibleCountBodies(morgueDir)
except FileNotFoundError:
# we probably just got in the period when firefox was cleaning up.
# retry...
time.sleep(0.5)
def ensureCleanDirectory(self):
orphanedBodiesCount = self.countBodies()