From 9d8f18a4a4d71da6a96d6c2ab5f18baaaf3c34f4 Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 1 May 2017 19:08:02 +0200 Subject: [PATCH] Fix #3160: Disable sha-conflict This test was always failing but was marked as passed by the previous scripted framework because the test files were only checking the failure of tests. The test case depends on bintray, which could never have been resolved for sbt 1.0.0-SNAPSHOT. This resolution error was the one "hidden". --- sbt/src/sbt-test/project-load/sha-conflict/{pending => disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt/src/sbt-test/project-load/sha-conflict/{pending => disabled} (100%) diff --git a/sbt/src/sbt-test/project-load/sha-conflict/pending b/sbt/src/sbt-test/project-load/sha-conflict/disabled similarity index 100% rename from sbt/src/sbt-test/project-load/sha-conflict/pending rename to sbt/src/sbt-test/project-load/sha-conflict/disabled