WIP: adds logic to rename in noop to delete and retry if file already…

… exists so it works on windows)
cloudfoundry · Feb 23, 2015 · 73ad497 · 73ad497
1 parent 1e59e50
commit 73ad497
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/.cached_downloader.go.swp b/.cached_downloader.go.swp
diff --git a/cached_downloader.go b/cached_downloader.go
@@ -25,6 +25,16 @@ type CachedDownloader interface {
 func NoopTransform(source, destination string) (int64, error) {
 	err := os.Rename(source, destination)
 	if err != nil {
+	    if _, ok := err.(*os.LinkError); ok {
+	    		err = os.Remove(destination)
+			if err != nil {
+				return 0, err
+			}
+			err = os.Rename(source, destination)
+			if err != nil {
+				return 0, err
+			}
+		}
 		return 0, err
 	}
 

diff --git a/cacheddownloader.test.exe b/cacheddownloader.test.exe
diff --git a/integration_test.go b/integration_test.go
@@ -15,7 +15,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Integration", func() {
+var _ = FDescribe("Integration", func() {
 	var (
 		server              *httptest.Server
 		serverPath          string