From 9e7c8bfccc05e8f595f5375db6549239155e7659 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Fri, 10 Dec 2010 11:02:56 -0600
Subject: [PATCH] Tweaking spec tests.

---
 .../keyvalue/riak/core/RiakKeyValueTemplateSpec.groovy    | 6 +++---
 .../data/keyvalue/riak/core/RiakTemplateSpec.groovy       | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplateSpec.groovy b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplateSpec.groovy
index 135167bf6..ae0d8cb58 100644
--- a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplateSpec.groovy
+++ b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplateSpec.groovy
@@ -37,17 +37,17 @@ class RiakKeyValueTemplateSpec extends Specification {
   @Autowired
   RiakKeyValueTemplate riak
   int run = 1
-  @Shared def riakBin = System.getenv("RIAK_BIN") ?: "/usr/sbin/riak"
+  @Shared def riakBin = System.properties["bamboo.RIAK_BIN"] ?: "/usr/sbin/riak"
   @Shared def p
 
   def setupSpec() {
-    p = "/usr/sbin/riak start".execute()
+    p = "$riakBin start".execute()
     p.waitFor()
     Thread.sleep(2000)
   }
 
   def cleanupSpec() {
-    p = "/usr/sbin/riak stop".execute()
+    p = "$riakBin stop".execute()
     p.waitFor()
   }
 
diff --git a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy
index 4bcd2ce86..82fd81625 100644
--- a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy
+++ b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy
@@ -37,21 +37,19 @@ class RiakTemplateSpec extends Specification {
   @Autowired
   RiakTemplate riak
   int run = 1
-  @Shared def riakBin = System.getenv("RIAK_BIN") ?: "/usr/sbin/riak"
+  @Shared def riakBin = System.properties["bamboo.RIAK_BIN"] ?: "/usr/sbin/riak"
   @Shared def p
 
-  /*
   def setupSpec() {
-    p = "/usr/sbin/riak start".execute()
+    p = "$riakBin start".execute()
     p.waitFor()
     Thread.sleep(2000)
   }
 
   def cleanupSpec() {
-    p = "/usr/sbin/riak stop".execute()
+    p = "$riakBin stop".execute()
     p.waitFor()
   }
-  */
 
   def "Test Map object"() {