From e35be414e0f17fcb799ac0602c7064cc3c6daaa5 Mon Sep 17 00:00:00 2001
From: Jaemyoun <jaemyoun@gmail.com>
Date: Tue, 17 May 2016 14:36:35 +0900
Subject: [PATCH] Skipping rados-tests
---
rados/pom.xml | 14 ++++++++++----
.../java/com/yahoo/ycsb/db/RadosClientTest.java | 11 +++++++++--
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/rados/pom.xml b/rados/pom.xml
index c25bccef..5a79ae64 100644
--- a/rados/pom.xml
+++ b/rados/pom.xml
@@ -47,10 +47,16 @@ LICENSE file.
<version>${json.version}</version>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.1.1</version>
- <scope>test</scope>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java b/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
index f6dadd96..52b86c5d 100644
--- a/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
+++ b/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
@@ -19,6 +19,8 @@ package com.yahoo.ycsb.db;
import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.Assume.assumeNoException;
+
import com.yahoo.ycsb.ByteIterator;
import com.yahoo.ycsb.DBException;
import com.yahoo.ycsb.Status;
@@ -75,8 +77,13 @@ public class RadosClientTest {
Properties p = new Properties();
p.setProperty(POOL_PROPERTY, POOL_TEST);
- radosclient.setProperties(p);
- radosclient.init();
+ try {
+ radosclient.setProperties(p);
+ radosclient.init();
+ }
+ catch (DBException e) {
+ assumeNoException("Ceph cluster is not running. Skipping tests.", e);
+ }
}
@AfterClass
--
GitLab