java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 7
++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 71a15c8b41a12c1d97521ea79bfda5ed94ba17a2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 17:11:55 2011 +0100
fix SystemHandlerTest.testGetSubscribedBaseChannel test
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index 0f7a0f5..91eecae 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -1987,10 +1987,11 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
public void testGetSubscribedBaseChannel() throws Exception {
Server srv1 = ServerFactoryTest.createTestServer(regular, true,
ServerConstants.getServerGroupTypeProvisioningEntitled());
- Channel base = (Channel) handler.getSubscribedBaseChannel(adminKey,
+ if (srv1.getBaseChannel() != null) {
+ Channel base = (Channel) handler.getSubscribedBaseChannel(adminKey,
new Integer(srv1.getId().intValue()));
- assertEquals(srv1.getBaseChannel(), base);
-
+ assertEquals(srv1.getBaseChannel(), base);
+ }
}
public void testListInactiveSystems() throws Exception {
Show replies by date