Skip to content

Commit

Permalink
chore: Unignore Hydra tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Jul 12, 2023
1 parent 6431f46 commit 03d7b9a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ jobs:

- name: Compile and test main projects
run: |
mkdir -p $HOME/.triplequote && echo "$HYDRA_LICENSE" > "$HOME/.triplequote/hydra.license"
sbt \
"frontend/test:compile; \
backend/test; \
Expand Down
17 changes: 9 additions & 8 deletions frontend/src/test/scala/bloop/HydraCompileSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package bloop

import java.nio.file.Paths

import scala.tools.nsc.Properties

import bloop.io.AbsolutePath
Expand All @@ -22,7 +24,7 @@ object HydraCompileSpec extends BaseCompileSpec {
private val TriplequoteResolver = MavenRepository.of(
"https://repo.triplequote.com/artifactory/libs-release/"
)
private val HydraVersion = "2.2.2"
private val HydraVersion = "2.3.11"

object HydraTestProject extends bloop.util.BaseTestProject {
override protected def mkScalaInstance(
Expand Down Expand Up @@ -53,14 +55,13 @@ object HydraCompileSpec extends BaseCompileSpec {
}
}

// private lazy val hydraLicenseExists: Boolean = {
// val hydraLicense = Paths.get(System.getProperty("user.home"), ".triplequote", "hydra.license")
// hydraLicense.toFile.exists()
// }
private lazy val hydraLicenseExists: Boolean = {
val hydraLicense = Paths.get(System.getProperty("user.home"), ".triplequote", "hydra.license")
hydraLicense.toFile.exists()
}

override def test(name: String)(fun: => Any): Unit = {
// if (hydraLicenseExists) super.test(name)(fun)
// else ignore(name, "Hydra license is missing")(fun)
ignore(name, "Hydra license is missing")(fun)
if (hydraLicenseExists) super.test(name)(fun)
else ignore(name, "Hydra license is missing")(fun)
}
}

0 comments on commit 03d7b9a

Please sign in to comment.