Skip to content

Commit 1c4615f

Browse files
committed
tst
1 parent 632707b commit 1c4615f

File tree

2 files changed

+7
-5
lines changed
  • plugins
    • core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles
    • toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils

2 files changed

+7
-5
lines changed

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileWatcherTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ class ProfileWatcherTest {
6565
profileFile.writeText("Test")
6666
profileFile.parentFile.deleteRecursively()
6767
}
68-
} catch (e: Error) {
68+
} catch (e: Throwable) {
6969
if (e is AssertionFailedError) {
7070
// suppress
7171
} else if (e.cause is IOException) {
7272
throw AssumptionViolatedException("native file watcher is not executable; possibly an issue with intellij-platform-gradle-plugin", e)
73+
} else {
74+
throw e
7375
}
7476
}
7577
}

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/JavaTestUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ private fun HeavyJavaCodeInsightTestFixtureRule.copyGradleFiles() {
171171
val gradleRoot = findGradlew()
172172

173173
// annoying and can't repro locally
174-
val gradleUserHome = Paths.get(System.getProperty("user.home"), ".gradle").toRealPath()
175-
if (gradleUserHome.exists()) {
176-
println("Allowing vfs access to $gradleUserHome")
177-
VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleUserHome.toString())
174+
val gradleWrapperHome = Paths.get(System.getProperty("user.home"), ".gradle", "wrapper").toRealPath()
175+
if (gradleWrapperHome.exists()) {
176+
println("Allowing vfs access to $gradleWrapperHome")
177+
VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleWrapperHome.toString())
178178
}
179179

180180
val gradleFiles = setOf("gradle/wrapper", "gradlew.bat", "gradlew")

0 commit comments

Comments
 (0)