aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-09-12 14:56:44 +0100
committerChristopher Vogt <oss.nsp@cvogt.org>2016-09-12 14:56:44 +0100
commit2930f91593ccdb750345b65609e88cd187d8351f (patch)
treec9129bcf09eca42f3f5282f46a5a55df2e7c1b6b /test
parentf886b385aea32b6387384bd4c72edea275ac691a (diff)
downloadcbt-2930f91593ccdb750345b65609e88cd187d8351f.tar.gz
cbt-2930f91593ccdb750345b65609e88cd187d8351f.tar.bz2
cbt-2930f91593ccdb750345b65609e88cd187d8351f.zip
fix tests when nailgun started from different cwd
Diffstat (limited to 'test')
-rw-r--r--test/test.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test.scala b/test/test.scala
index 7bbf1d9..e5ec1f9 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -75,8 +75,8 @@ object Main{
def clean(path: String)(implicit logger: Logger) = {
val res = runCbt(path, Seq("clean", "dry-run", "force"))
- val debugToken = "\n"++lib.red("Deleting") ++ " " ++ Paths.get("test/"++path++"/target").toAbsolutePath.toString++"\n"
- val debugToken2 = "\n"++lib.red("Deleting") ++ " " ++ Paths.get("test/"++path).toAbsolutePath.toString++"\n"
+ val debugToken = "\n"++lib.red("Deleting") ++ " " ++ (cbtHome ++("/test/"++path++"/target")).toPath.toAbsolutePath.toString++"\n"
+ val debugToken2 = "\n"++lib.red("Deleting") ++ " " ++ (cbtHome ++("/test/"++path)).toPath.toAbsolutePath.toString++"\n"
assertSuccess(res,debugToken)
assert(res.out == "", debugToken ++ " " ++ res.toString)
assert(res.err.contains(debugToken), debugToken ++ " " ++ res.toString)
@@ -87,7 +87,7 @@ object Main{
res.err.split("\n").filter(_.startsWith(lib.red("Deleting"))).foreach{ line =>
assert(
line.size >= debugToken2.trim.size,
- "Tried to delete too much: " ++ line
+ "Tried to delete too much: " ++ line ++" debugToken2: " ++ debugToken2
)
}
}