Hi,
If I understand code correctly MasterHandlerTest is about testing that
some methods can or cannot be called by administrators and regular
users. IssMaster objects are created ad-hoc for testing, and one of them
is "flagged" and "unflagged" as default during the tests themselves. The
only problem is the very first call to getDefaultMaster(): since none of
the test IssMaster objects has been flagged as default yet, the call may
or may not throw exceptions depending on the previous state.
The attached patch simply ignores such exception for the very first call.
Regards,
--
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany
>From 463c0da101a290bbee3449d6c77bfce415cad696 Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Mon, 9 Sep 2013 13:48:27 +0200
Subject: [PATCH 06/22] MasterHandlerTest: handle getDefaultMaster exceptions
correctly
---
.../rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java
index 5bff49b..eb1035b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java
@@ -148,7 +148,13 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
// Make sure satellite-admin can
try {
- IssMaster defaultMaster = handler.getDefaultMaster(adminKey);
+ IssMaster defaultMaster = null;
+ try {
+ defaultMaster = handler.getDefaultMaster(adminKey);
+ }
+ catch (LookupException e) {
+ // master not found, leave null
+ }
int rc = handler.makeDefault(adminKey, master1.getId().intValue());
assertEquals(1, rc);
--
1.8.1.4
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
