HBASE-6958 TestAssignmentManager sometimes fails

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1406699 13f79535-47bb-0310-9956-ffa450edef68

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java

@@ -865,6 +865,9 @@ public class TestAssignmentManager {
       assertTrue("Table should be disabled.",
           am.getZKTable().isDisabledTable(REGIONINFO.getTableNameAsString()));
     } finally {
+      this.server.getConfiguration().setClass(
+        HConstants.HBASE_MASTER_LOADBALANCER_CLASS, DefaultLoadBalancer.class,
+        LoadBalancer.class);
       am.getZKTable().setEnabledTable(REGIONINFO.getTableNameAsString());
       am.shutdown();
     }