From 90641c755a84b6f236cdd588cfa8f227dc158e68 Mon Sep 17 00:00:00 2001
From: Ruslan Kuprieiev <kupruser@gmail.com>
Date: Sun, 29 Oct 2017 23:25:42 +0200
Subject: [PATCH] functest: fix merge test

Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>
---
 functest/common.sh     | 8 ++++++++
 functest/test-merge.sh | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/functest/common.sh b/functest/common.sh
index de24a6ae0..694d038d5 100644
--- a/functest/common.sh
+++ b/functest/common.sh
@@ -22,6 +22,14 @@ TEST_REPO_REGION='us-east-2'
 TEST_REPO_GCP='dvc-test/myrepo'
 TEST_REPO_GCP_PROJECT='dvc-project'
 
+function dvc_md5() {
+	if [ "$(uname)" == "Darwin" ]; then
+		md5 -r $@
+	else
+		md5sum $@
+	fi
+}
+
 function dvc_print() {
 	echo -e "$1"
 }
diff --git a/functest/test-merge.sh b/functest/test-merge.sh
index 5d6399af8..2afbe4153 100755
--- a/functest/test-merge.sh
+++ b/functest/test-merge.sh
@@ -18,7 +18,7 @@ git commit -s -m"add code"
 
 dvc import https://s3-us-west-2.amazonaws.com/dvc-share/so/50K/Posts.xml.tgz data/data
 
-ORIG_DATA=$(readlink -- data/data)
+ORIG_DATA=$(dvc_md5 data/data)
 
 dvc run ./code/code1.sh data/data data/data1
 dvc run ./code/code2.sh data/data1 data/data2
@@ -30,7 +30,7 @@ git commit -am 'Set Target'
 
 # Create new branch to work on small data set
 git checkout -b input_10K
-dvc remove data/data
+dvc remove -c -l data/data
 dvc import https://s3-us-west-2.amazonaws.com/dvc-share/so/10K/Posts.xml.tgz data/data
 dvc repro
 
@@ -46,10 +46,10 @@ git merge input_10K
 dvc merge
 
 # Verify that data and respective state file are restored properly
-if [ "$(readlink -- "data/data")" != "$ORIG_DATA" ]; then
+if [ "$(dvc_md5 data/data)" != "$ORIG_DATA" ]; then
 	dvc_fail
 fi
 
-grep $(basename "$ORIG_DATA") .dvc/state/data.state || dvc_fail
+grep $(echo "$ORIG_DATA" | cut -d " " -f1) .dvc/state/data/data.state || dvc_fail
 
 dvc_pass