From 26264c1c44ddd6c6a79bb3930b7873f185d7239b Mon Sep 17 00:00:00 2001 From: DEMAREY Christophe Date: Fri, 22 Mar 2024 09:51:14 +0100 Subject: [PATCH] delete after process terminate --- .github/workflows/CI.yml | 4 ++-- build.sh | 2 +- .../PhLLaunchImageTest.class.st | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e7665396..8d320f7f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -62,8 +62,8 @@ jobs: - name: Build run: VERSION=${SHORT_SHA} ./build.sh prepare - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 - name: test run: VERSION=${SHORT_SHA} ./build.sh test diff --git a/build.sh b/build.sh index 01e9158d..008e1a77 100755 --- a/build.sh +++ b/build.sh @@ -35,7 +35,7 @@ function run_tests() { rm -rf ~/Pharo # clean posssible remaining Pharo files ./pharo --version ls -R pharo-vm - ./pharo PharoLauncher.image test --junit-xml-output "PharoLauncher-Tests-Functional.PhLLaunchImageTest" + ./pharo PharoLauncher.image test --junit-xml-output "PharoLauncher-Tests-Functional.*" run_shell_cli_tests } diff --git a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st index af6c8826..26ecf4f1 100644 --- a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st +++ b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st @@ -134,10 +134,10 @@ PhLLaunchImageTest >> setUp [ { #category : #running } PhLLaunchImageTest >> tearDown [ PhLLaunchConfiguration launchInALoginShell: launchInALoginShellBackup. - "tempVmStoreFolder ensureDeleteAll." PhLVirtualMachineManager vmStore: vmStoreBackup. - "imageDir ensureDeleteAll." process ifNotNil: [ process isRunning ifTrue: [ process terminate ] ]. + tempVmStoreFolder ensureDeleteAll. + imageDir ensureDeleteAll. super tearDown ]