summaryrefslogtreecommitdiff
path: root/qpid/java/bdbstore
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2015-03-16 11:02:59 +0000
committerAlex Rudyy <orudyy@apache.org>2015-03-16 11:02:59 +0000
commitf433cd264f9840a82ebade37c68442a1e10de78d (patch)
tree9f803c27b08d68546064a0fbfbdc52a82b8de76c /qpid/java/bdbstore
parent15a0805961d67db689552c1a2494909b29d1cb00 (diff)
downloadqpid-python-f433cd264f9840a82ebade37c68442a1e10de78d.tar.gz
QPID-6449: Fix failing tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666959 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore')
-rw-r--r--qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
index 6d3bacc286..12841b448f 100644
--- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
+++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
@@ -35,6 +35,7 @@ import com.sleepycat.je.Durability;
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.rep.ReplicatedEnvironment;
import com.sleepycat.je.rep.ReplicationConfig;
+import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
import org.apache.qpid.server.model.RemoteReplicationNode;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
@@ -242,7 +243,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase
// try to add not permitted node
Map<String, Object> nodeData = createNodeAttributeMap(NODE2, intruderPort, _node1HaPort);
- getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE2, "PUT", nodeData, HttpServletResponse.SC_CONFLICT);
+ getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE2, "PUT", nodeData, RestServlet.SC_UNPROCESSABLE_ENTITY);
assertRemoteNodes(NODE1, NODE3);
}