Skip to content

Commit cd0f91a

Browse files
committed
refactor: Don't try to download artifacts in ProblemResolverSuite
The tests often timeout if coursier with retries is involved and besides mtags are not published aside from 2.13.x so this will always fail.
1 parent 99831af commit cd0f91a

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

tests/unit/src/main/scala/tests/BaseLspSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ abstract class BaseLspSuite(
5656
protected def useVirtualDocuments = useVirtualDocs
5757

5858
protected def mtagsResolver: MtagsResolver =
59-
new TestMtagsResolver
59+
new TestMtagsResolver(checkCoursier = true)
6060

6161
override def afterAll(): Unit = {
6262
if (server != null) {

tests/unit/src/main/scala/tests/TestMtagsResolver.scala

+9-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ import scala.meta.internal.metals.ScalaVersions
1010
* For `unit` we don't publish mtags at all but there are some tests that trigger docker check.
1111
* So for these cases, do fallback on previous mechanic by checking declared supported versions.
1212
*/
13-
class TestMtagsResolver extends MtagsResolver {
13+
class TestMtagsResolver(checkCoursier: Boolean) extends MtagsResolver {
1414

1515
val default: MtagsResolver = MtagsResolver.default()
1616

17+
private def localCheck(scalaVersion: String) =
18+
if (ScalaVersions.isSupportedAtReleaseMomentScalaVersion(scalaVersion))
19+
Some(MtagsBinaries.BuildIn)
20+
else None
21+
1722
override def resolve(scalaVersion: String): Option[MtagsBinaries] = {
18-
default.resolve(scalaVersion).orElse {
19-
if (ScalaVersions.isSupportedAtReleaseMomentScalaVersion(scalaVersion))
20-
Some(MtagsBinaries.BuildIn)
21-
else None
22-
}
23+
if (checkCoursier)
24+
default.resolve(scalaVersion).orElse(localCheck(scalaVersion))
25+
else localCheck(scalaVersion)
2326
}
2427

2528
override def isSupportedInOlderVersion(version: String): Boolean =

tests/unit/src/main/scala/tests/TestScala3Compiler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object TestScala3Compiler {
1919
def compiler(name: String, input: InputProperties)(implicit
2020
ec: ExecutionContext
2121
): Option[PresentationCompiler] = {
22-
val resolver = new TestMtagsResolver()
22+
val resolver = new TestMtagsResolver(checkCoursier = true)
2323
resolver.resolve(V.scala3) match {
2424
case Some(mtags: MtagsBinaries.Artifacts) =>
2525
val time = new FakeTime

tests/unit/src/test/scala/tests/troubleshoot/ProblemResolverSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class ProblemResolverSuite extends FunSuite {
228228

229229
val problemResolver = new ProblemResolver(
230230
AbsolutePath(workspace),
231-
new TestMtagsResolver,
231+
new TestMtagsResolver(checkCoursier = false),
232232
() => None,
233233
() => javaHome,
234234
() => isTestExplorerProvider,

0 commit comments

Comments
 (0)