modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

New commits: commit bcc35b635d721722958e91026585fcdbb7ae93a6 Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 28 20:43:05 2013 -0400

BZ 535289 - adjust this test since we now allow ignoring resources to happen even if the parent isn't committed. we still do not allow COMMITTING resources if the parent isn't committed.

diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java index 137e76f..9c3e007 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java @@ -289,16 +289,9 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { int[] arrayOfServerIds = ArrayUtils.unwrapCollection(serverIds);

// Now test ignore, unignore and import behavior - - try { - discoveryBoss.ignoreResources(subjectManager.getOverlord(), arrayOfServerIds); - fail("Ignore resources should fail as platform resource has not yet been comitted"); - } catch (EJBException e) { - assertEquals(String.valueOf(e.getCause()), IllegalStateException.class, e.getCause().getClass()); - assertTrue(String.valueOf(e.getCause()), e.getCause().getMessage().contains("has not yet been committed")); - } discoveryBoss.importResources(subjectManager.getOverlord(), new int[] { platformId }); discoveryBoss.ignoreResources(subjectManager.getOverlord(), arrayOfServerIds); + try { discoveryBoss.importResources(subjectManager.getOverlord(), arrayOfServerIds); fail("Import resources should fail for ignored resources");