diff --git a/test/leiningen/core.clj b/test/leiningen/core.clj deleted file mode 100644 index cc4a9fd5..00000000 --- a/test/leiningen/core.clj +++ /dev/null @@ -1,4 +0,0 @@ -(ns leiningen.core - "Just to allow the bloody old tests to compile.") - -(declare read-project defproject abort project repositories-for default-repos) \ No newline at end of file diff --git a/test/leiningen/test/jar.clj b/test/leiningen/test/jar.clj index 5b61181a..7a4b0d9a 100644 --- a/test/leiningen/test/jar.clj +++ b/test/leiningen/test/jar.clj @@ -1,7 +1,6 @@ (ns leiningen.test.jar (:require [clojure.java.io :as io]) (:use [clojure.test] - [leiningen.core :only [defproject read-project]] [leiningen.jar] [leiningen.core.eval :only [platform-nullsink]] [leiningen.test.helper :only [tricky-name-project sample-failing-project diff --git a/test/leiningen/test/javac.clj b/test/leiningen/test/javac.clj index 700458da..47e712f3 100644 --- a/test/leiningen/test/javac.clj +++ b/test/leiningen/test/javac.clj @@ -2,7 +2,6 @@ (:use [clojure.test] [clojure.java.io :only [file]] [leiningen.javac :only [javac]] - [leiningen.core :only [read-project defproject]] [leiningen.test.helper :only [delete-file-recursively #_dev-deps-project]])) diff --git a/test/leiningen/test/test.clj b/test/leiningen/test/test.clj index c2c69c3d..acebbc48 100644 --- a/test/leiningen/test/test.clj +++ b/test/leiningen/test/test.clj @@ -2,7 +2,8 @@ (:refer-clojure :exclude [test]) (:use [clojure.test] [leiningen.test] - [leiningen.test.helper :only [tmp-dir sample-no-aot-project]])) + [leiningen.test.helper :only [tmp-dir sample-no-aot-project]]) + (:require [clojure.java.io :as io])) (use-fixtures :each (fn [f] @@ -10,9 +11,11 @@ (.delete (java.io.File. tmp-dir "lein-test-ran")))) (defn ran? [& expected] - (= (set expected) - (set (for [ran (.split (slurp (format "%s/lein-test-ran" tmp-dir)) "\n")] - (read-string ran))))) + (let [ran-file (io/file tmp-dir "lein-test-ran")] + (and (.exists ran-file) + (= (set expected) + (set (for [ran (.split (slurp ran-file) "\n")] + (read-string ran))))))) (deftest test-project-selectors (is (= [:default :integration :int2 :no-custom]