I attached two patches:
0001 - avoid failure if virtualization channels/packages are not present;
0002 - use Session.disconnect() instead of session.clear() after an
expected ROLLBACK to properly resume Hibernate work in the test method,
as clear() was not enough, at least in our environment, to keep Postgres
from failing on subsequent statements.
Regards,
--
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany
>From f0b8fd871e09bf4300b2d2a7f5166965b77ea7cf Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Thu, 5 Sep 2013 11:58:35 +0200
Subject: [PATCH 2/2] VirtualizationEntitlementsManagerTest: do not fail after
rollback
Tests on Postgres failed because it did not accept statements after an expected ROLLBACK. Now connection is disposed properly.
---
.../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 6a02efe..031deed 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
@@ -162,7 +162,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 7b7b2a28ed9bf4181e74d2768d981ce1a34f320d 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 f12bbde..6a02efe 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 com.redhat.rhn.testing.UserTestUtils;
import java.util.Collection;
@@ -77,6 +78,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
