killbill-memoizeit

diff --git a/util/src/test/java/org/killbill/billing/util/dao/KombuchaSqlDao.java b/util/src/test/java/org/killbill/billing/util/dao/KombuchaSqlDao.java
index a5827f6..b9db3b1 100644
--- a/util/src/test/java/org/killbill/billing/util/dao/KombuchaSqlDao.java
+++ b/util/src/test/java/org/killbill/billing/util/dao/KombuchaSqlDao.java
@@ -25,5 +25,5 @@ import org.skife.jdbi.v2.sqlobject.SqlQuery;
 interface KombuchaSqlDao extends EntitySqlDao<KombuchaModelDao, Kombucha> {
 
     @SqlQuery
-    public boolean isIsTimeForKombucha();
+    public boolean isItTimeForKombucha();
 }

diff --git a/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java b/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java
index 588d765..c099f56 100644
--- a/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java
+++ b/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java
@@ -31,7 +31,7 @@ public class TestStringTemplateInheritance extends UtilTestSuiteNoDB {
         final STGroup kombucha = new STGroupFile(this.getClass().getResource("/org/killbill/billing/util/dao/Kombucha.sql.stg"), "UTF-8", '<', '>');
 
         // Verify non inherited template
-        Assert.assertEquals(kombucha.getInstanceOf("isIsTimeForKombucha").render(), "select hour(current_timestamp(0)) = 17 as is_time;");
+        Assert.assertEquals(kombucha.getInstanceOf("isItTimeForKombucha").render(), "select hour(current_timestamp(0)) < 24 as is_time;");
 
         // Verify inherited templates
         assertPattern(kombucha.getInstanceOf("getById").render(), "select\r?\n" +

diff --git a/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritanceWithJdbi.java b/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritanceWithJdbi.java
index fa36842..e2be33a 100644
--- a/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritanceWithJdbi.java
+++ b/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritanceWithJdbi.java
@@ -28,7 +28,7 @@ public class TestStringTemplateInheritanceWithJdbi extends UtilTestSuiteWithEmbe
         final KombuchaSqlDao dao = dbi.onDemand(KombuchaSqlDao.class);
 
         // Verify non inherited template
-        Assert.assertEquals(dao.isIsTimeForKombucha(), clock.getUTCNow().getHourOfDay() == 17);
+        Assert.assertTrue(dao.isItTimeForKombucha());
 
         // Verify inherited templates
         Assert.assertFalse(dao.getAll(internalCallContext).hasNext());

diff --git a/util/src/test/java/org/killbill/billing/util/listener/TestRetryableService.java b/util/src/test/java/org/killbill/billing/util/listener/TestRetryableService.java
index eed7a14..cb10dd8 100644
--- a/util/src/test/java/org/killbill/billing/util/listener/TestRetryableService.java
+++ b/util/src/test/java/org/killbill/billing/util/listener/TestRetryableService.java
@@ -71,6 +71,10 @@ public class TestRetryableService extends UtilTestSuiteWithEmbeddedDB {
 
     @BeforeMethod(groups = "slow")
     public void setUp() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
+
         event = new DefaultControlTagCreationEvent(UUID.randomUUID(),
                                                    UUID.randomUUID(),
                                                    ObjectType.ACCOUNT,
@@ -86,6 +90,10 @@ public class TestRetryableService extends UtilTestSuiteWithEmbeddedDB {
 
     @AfterMethod(groups = "slow")
     public void tearDown() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
+
         testListener.stop();
     }
 

diff --git a/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg b/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg
index 52dbbc8..ac26f3d 100644
--- a/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg
+++ b/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg
@@ -16,6 +16,6 @@ tableValues() ::= <<
 , :sugar
 >>
 
-isIsTimeForKombucha() ::= <<
-select hour(current_timestamp(0)) = 17 as is_time;
+isItTimeForKombucha() ::= <<
+select hour(current_timestamp(0)) \< 24 as is_time;
 >>