From 4e380d60551b1594e047ccedb19b729e560f3a8d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 16 Jul 2017 15:29:21 -0400 Subject: [PATCH] Fixes dependency-management/cached-resolution-conflicts --- .../cached-resolution-conflicts/pending | 10 ---------- .../cached-resolution-conflicts/test | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/pending create mode 100644 sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/test diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/pending b/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/pending deleted file mode 100644 index 9c88a5605..000000000 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/pending +++ /dev/null @@ -1,10 +0,0 @@ -# Quoting @eed3si9n in https://github.com/dwijnand/sbt-lm/pull/1 : -# > After several experiments, I'm actually convinced that force() is unrelated to the scripted scenario, -# > and it's # currently passing by virtue of the questionable caching behavior: -# > https://github.com/sbt/sbt/blob/c223dccb542beaf763a3a2909cda74bdad39beca/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala#L715 -# > I think we can mark the failing test as pending for now. - -> y1/publishLocal -> y2/publishLocal -> debug -> check diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/test b/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/test new file mode 100644 index 000000000..8e266c833 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/test @@ -0,0 +1,4 @@ +> y1/publishLocal +> y2/publishLocal +> debug +> check