From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/test/java/com/gitblit/tests/RpcTests.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java
index e1ba907..ced1a13 100644
--- a/src/test/java/com/gitblit/tests/RpcTests.java
+++ b/src/test/java/com/gitblit/tests/RpcTests.java
@@ -32,7 +32,7 @@
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
-import com.gitblit.GitBlitException.NotAllowedException;
+import com.gitblit.GitBlitException.ForbiddenException;
import com.gitblit.GitBlitException.UnauthorizedException;
import com.gitblit.Keys;
import com.gitblit.models.FederationModel;
@@ -104,7 +104,7 @@
UserModel user = null;
try {
user = RpcUtils.getUser("admin", url, null, null);
- } catch (NotAllowedException e) {
+ } catch (ForbiddenException e) {
}
assertNull("Server allows anyone to get user!", user);
--
Gitblit v1.9.1