From a612f157a33d85d452a9a60fc01b9c44e76180a0 Mon Sep 17 00:00:00 2001
From: Shudong Zhou <shudongzhou@gmail.com>
Date: Sat, 16 Mar 2013 23:55:11 -0700
Subject: [PATCH] Make ControllerTest.testErrorEPERM() more robust
---
.../floodlightcontroller/core/internal/ControllerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
index 94553f3c8..fd373279e 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -1138,12 +1138,14 @@ public class ControllerTest extends FloodlightTestCase
// Make sure controller attempts to reset switch master
expect(sw.getAttribute("supportsNxRole")).andReturn(true).anyTimes();
expect(sw.getNextTransactionId()).andReturn(0).anyTimes();
+ sw.write(EasyMock.<List<OFMessage>> anyObject(),
+ (FloodlightContext)anyObject());
// test
replay(sw, lock);
chdlr.processOFMessage(error);
// Verify there is a pending role change request
- assertTrue(controller.roleChanger.pendingTasks.poll() != null);
+ assertTrue(controller.roleChanger.pendingTasks.peek() != null);
}
// Helper function.
--
GitLab