On 09/09/2013 08:29 AM, Silvio Moioli wrote:
> I attached two patches:
Patches updated to apply cleanly after Grant's commits.
I apologize for the double post.
Regards,
--
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany
>From 8b9f6060b5db94e49edb9fb804562a89bc188580 Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Mon, 9 Sep 2013 08:52:14 +0200
Subject: [PATCH 2/2] VirtualizationEntitlementsManagerTest: do not fail after
rollback
---
.../rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java
index 7824512..6f65e85 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java
@@ -161,7 +161,7 @@ public class VirtualizationEntitlementsManagerTest extends BaseTestCaseWithUser
}
assertEquals(1, VirtualizationEntitlementsManager.getInstance().
convertToFlex(sids, group.getId(), user).size());
- HibernateFactory.getSession().clear();
+ HibernateFactory.getSession().disconnect();
l = VirtualizationEntitlementsManager.getInstance().listFlexGuests(user);
assertTrue(!l.isEmpty());
assertEquals(1, l.size());
--
1.8.1.4
>From e25b01758da24d955b0c41e87a61d31f8448947c Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Thu, 5 Sep 2013 11:52:58 +0200
Subject: [PATCH 1/2] VirtualizationEntitlementsManagerTest: do not assume a
virtualization channel exists
---
.../rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java
index d8f0845..7824512 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/VirtualizationEntitlementsManagerTest.java
@@ -40,6 +40,7 @@ import com.redhat.rhn.manager.system.ServerGroupManager;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.system.VirtualizationEntitlementsManager;
import com.redhat.rhn.testing.BaseTestCaseWithUser;
+import com.redhat.rhn.testing.ChannelTestUtils;
import java.util.Collection;
import java.util.LinkedList;
@@ -76,6 +77,7 @@ public class VirtualizationEntitlementsManagerTest extends BaseTestCaseWithUser
Server host = s.getVirtualInstance().getHostSystem();
Long hostId = host.getId();
assertNotNull(host);
+ ChannelTestUtils.setupBaseChannelForVirtualization(user, host.getBaseChannel());
SystemManager.entitleServer(host, EntitlementManager.VIRTUALIZATION);
l = VirtualizationEntitlementsManager.getInstance().
--
1.8.1.4
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
