[incubator-mxnet] branch master updated: [clojure] fix: image test does not rely on s3 to run (#15122)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kedarb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 52f77c9  [clojure] fix: image test does not rely on s3 to run (#15122)
52f77c9 is described below

commit 52f77c971e8a6e5c8c6942345fd6cfd058377d69
Author: Arthur Caillau <Ch...@users.noreply.github.com>
AuthorDate: Sun Jun 2 18:20:49 2019 +0200

    [clojure] fix: image test does not rely on s3 to run (#15122)
    
    * [clojure] fix: image test does not rely on s3 to run
    
    * rename `with-image` to `with-file`
---
 .../test/org/apache/clojure_mxnet/image_test.clj   | 34 +++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/contrib/clojure-package/test/org/apache/clojure_mxnet/image_test.clj b/contrib/clojure-package/test/org/apache/clojure_mxnet/image_test.clj
index 23b88d0..b543b2d 100644
--- a/contrib/clojure-package/test/org/apache/clojure_mxnet/image_test.clj
+++ b/contrib/clojure-package/test/org/apache/clojure_mxnet/image_test.clj
@@ -19,32 +19,40 @@
   (:require [org.apache.clojure-mxnet.image :as image]
             [org.apache.clojure-mxnet.ndarray :as ndarray]
             [clojure.java.io :as io]
-            [clojure.test :refer :all])
+            [clojure.test :refer [deftest is use-fixtures]])
   (:import (javax.imageio ImageIO)
            (java.io File)))
 
 (def tmp-dir (System/getProperty "java.io.tmpdir"))
 (def image-path (.getAbsolutePath (io/file tmp-dir "Pug-Cookie.jpg")))
+(def image-src-path "test/test-images/Pug-Cookie.jpg")
 
-(defn download-image []
-  (with-open [in (io/input-stream "https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg")
-              out (io/output-stream (io/file image-path))]
+(defn- cp
+  "Copy from filepath `from` to filepath `to`."
+  [from to]
+  (with-open [in (io/input-stream (io/file from))
+              out (io/output-stream (io/file to))]
     (io/copy in out)))
 
-(defn delete-image []
-  (io/delete-file image-path))
+(defn- rm
+  "Removes `filepath`."
+  [filepath]
+  (io/delete-file filepath))
 
-(defn with-downloaded-image [f]
-  (download-image)
-  (f)
-  (delete-image))
+(defn- with-file
+  "Provides `src-path` in `dest-path` for the test function `f` to use."
+  [src-path dest-path]
+  (fn [f]
+    (cp src-path dest-path)
+    (f)
+    (rm dest-path)))
 
-(use-fixtures :once with-downloaded-image)
+(use-fixtures :once (with-file image-src-path image-path))
 
 (deftest test-decode-image
-  (let [img-arr (image/decode-image 
+  (let [img-arr (image/decode-image
                  (io/input-stream image-path))
-        img-arr-2 (image/decode-image 
+        img-arr-2 (image/decode-image
                    (io/input-stream image-path)
                    {:color-flag image/GRAYSCALE})]
     (is (= [576 1024 3] (ndarray/shape-vec img-arr)))