[buildstream] branch juerg/integration-cache updated: test

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch juerg/integration-cache
in repository https://gitbox.apache.org/repos/asf/buildstream.git


The following commit(s) were added to refs/heads/juerg/integration-cache by this push:
     new f6d5644  test
f6d5644 is described below

commit f6d5644d3a94811e6da3a8ab4c8b576dc396abf1
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Sun Oct 24 21:19:43 2021 +0200

    test
---
 src/buildstream/testing/integration.py | 1 +
 src/buildstream/testing/runcli.py      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/buildstream/testing/integration.py b/src/buildstream/testing/integration.py
index 662111d..faa53ca 100644
--- a/src/buildstream/testing/integration.py
+++ b/src/buildstream/testing/integration.py
@@ -103,5 +103,6 @@ def integration_cache(request):
 
     # Clean up the artifacts after each test session - we only want to
     # cache sources between tests
+    os.system("rm -rf " + cache.cachdir)
     shutil.rmtree(cache.cachedir, ignore_errors=True)
     shutil.rmtree(os.path.join(cache.root, "cas"), ignore_errors=True)
diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py
index 31b74c6..aba0572 100644
--- a/src/buildstream/testing/runcli.py
+++ b/src/buildstream/testing/runcli.py
@@ -761,11 +761,11 @@ def cli_integration(tmpdir, integration_cache):
     # remove following folders if necessary
     try:
         shutil.rmtree(os.path.join(integration_cache.cachedir, "build"))
-    except FileNotFoundError:
+    except Exception:
         pass
     try:
         shutil.rmtree(os.path.join(integration_cache.cachedir, "tmp"))
-    except FileNotFoundError:
+    except Exception:
         pass