Merge lp:~chipaca/ubuntu-push/help-make-tests-pass-in-packaging into lp:ubuntu-push

[John Lenton]

made GetSourceRelative look at the environ to help make the tests pass in packaging

made GetSourceRelative look at the environ to help make the tests pass in packaging

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'testing/helpers.go'
--- testing/helpers.go	2014-02-06 11:20:21 +0000
+++ testing/helpers.go	2014-02-07 10:49:42 +0000
@@ -18,7 +18,9 @@
 package testing
 
 import (
+	"fmt"
 	"launchpad.net/ubuntu-push/logger"
+	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -102,5 +104,19 @@
 	if !ok {
 		panic("failed to get source filename using Caller()")
 	}
-	return filepath.Join(filepath.Dir(file), relativePath)
+	dir := filepath.Dir(file)
+
+	root := os.Getenv("UBUNTU_PUSH_TEST_RESOURCES_ROOT")
+	if root != "" {
+		const sep = "launchpad.net/ubuntu-push/"
+
+		idx := strings.LastIndex(dir, sep)
+		if idx == -1 {
+			panic(fmt.Errorf("Unable to find %s in %#v", sep, dir))
+		}
+		idx += len(sep)
+
+		dir = filepath.Join(root, dir[idx:])
+	}
+	return filepath.Join(dir, relativePath)
 }