From 7ebf48ef429acefc2cf892437e89a13d255b41bf Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Thu, 26 Jun 2014 15:33:06 +0100
Subject: [PATCH] Fix --dry-run not working and add tests for it - fixes #3

---
 fs/config.go             |  2 +-
 fs/operations.go         |  6 +++++-
 rclonetest/rclonetest.go | 35 +++++++++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/fs/config.go b/fs/config.go
index dbd00c7a6..c37fcd672 100644
--- a/fs/config.go
+++ b/fs/config.go
@@ -70,10 +70,10 @@ func LoadConfig() {
 	// FIXME read these from the config file too
 	Config.Verbose = *verbose
 	Config.Quiet = *quiet
-	Config.Quiet = *dryRun
 	Config.ModifyWindow = *modifyWindow
 	Config.Checkers = *checkers
 	Config.Transfers = *transfers
+	Config.DryRun = *dryRun
 
 	ConfigPath = *configFile
 
diff --git a/fs/operations.go b/fs/operations.go
index 7305433f6..8019c4f11 100644
--- a/fs/operations.go
+++ b/fs/operations.go
@@ -178,7 +178,11 @@ func Copier(in ObjectPairChan, fdst Fs, wg *sync.WaitGroup) {
 	for pair := range in {
 		src := pair.src
 		Stats.Transferring(src)
-		Copy(fdst, pair.dst, src)
+		if Config.DryRun {
+			Debug(src, "Not copying as --dry-run")
+		} else {
+			Copy(fdst, pair.dst, src)
+		}
 		Stats.DoneTransferring(src)
 	}
 }
diff --git a/rclonetest/rclonetest.go b/rclonetest/rclonetest.go
index 59395ea5e..ec42f7ea7 100644
--- a/rclonetest/rclonetest.go
+++ b/rclonetest/rclonetest.go
@@ -151,7 +151,11 @@ var t2 = Time("2011-12-25T12:59:59.123456789Z")
 func TestCopy(flocal, fremote fs.Fs) {
 	WriteFile("empty space", "", t1)
 
+	// Check dry run is working
+	log.Printf("Copy with --dry-run")
+	fs.Config.DryRun = true
 	err := fs.Sync(fremote, flocal, false)
+	fs.Config.DryRun = false
 	if err != nil {
 		log.Fatalf("Copy failed: %v", err)
 	}
@@ -159,6 +163,18 @@ func TestCopy(flocal, fremote fs.Fs) {
 	items := []Item{
 		{Path: "empty space", Size: 0, ModTime: t1, Md5sum: "d41d8cd98f00b204e9800998ecf8427e"},
 	}
+
+	CheckListing(flocal, items)
+	CheckListing(fremote, []Item{})
+
+	// Now without dry run
+
+	log.Printf("Copy")
+	err = fs.Sync(fremote, flocal, false)
+	if err != nil {
+		log.Fatalf("Copy failed: %v", err)
+	}
+
 	CheckListing(flocal, items)
 	CheckListing(fremote, items)
 }
@@ -211,22 +227,37 @@ func TestSync(flocal, fremote fs.Fs) {
 
 	// ------------------------------------------------------------
 
-	log.Printf("Sync after removing a file")
+	log.Printf("Sync after removing a file and adding a file --dry-run")
+	WriteFile("potato2", "------------------------------------------------------------", t1)
 	err = os.Remove(localName + "/potato")
 	if err != nil {
 		log.Fatalf("Remove failed: %v", err)
 	}
+	fs.Config.DryRun = true
 	err = fs.Sync(fremote, flocal, true)
+	fs.Config.DryRun = false
 	if err != nil {
 		log.Fatalf("Sync failed: %v", err)
 	}
 
+	before := []Item{
+		{Path: "empty space", Size: 0, ModTime: t2, Md5sum: "d41d8cd98f00b204e9800998ecf8427e"},
+		{Path: "potato", Size: 21, ModTime: t1, Md5sum: "100defcf18c42a1e0dc42a789b107cd2"},
+	}
 	items = []Item{
 		{Path: "empty space", Size: 0, ModTime: t2, Md5sum: "d41d8cd98f00b204e9800998ecf8427e"},
+		{Path: "potato2", Size: 60, ModTime: t1, Md5sum: "d6548b156ea68a4e003e786df99eee76"},
+	}
+	CheckListing(flocal, items)
+	CheckListing(fremote, before)
+
+	log.Printf("Sync after removing a file and adding a file")
+	err = fs.Sync(fremote, flocal, true)
+	if err != nil {
+		log.Fatalf("Sync failed: %v", err)
 	}
 	CheckListing(flocal, items)
 	CheckListing(fremote, items)
-
 }
 
 func TestLs(flocal, fremote fs.Fs) {