Author: stack
Date: Thu Mar 19 23:52:38 2009
New Revision: 756274
URL: http://svn.apache.org/viewvc?rev=756274&view=rev
Log:
HBASE-1270 Fix TestInfoServers
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=756274&r1=756273&r2=756274&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Mar 19 23:52:38 2009
@@ -52,6 +52,7 @@
(Ryan Rawson via Stack)
HBASE-1268 ZooKeeper config parsing can break HBase startup
(Nitay Joffe via Stack)
+ HBASE-1270 Fix TestInfoServers (Nitay Joffe via Stack)
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified:
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java?rev=756274&r1=756273&r2=756274&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java
(original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java
Thu Mar 19 23:52:38 2009
@@ -50,11 +50,11 @@
new HTable(conf, ".META.");
int port = cluster.getMaster().getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:"; + port +
- "/index.html"), "Master");
+ "/index.html"), "master");
port = cluster.getRegionThreads().get(0).getRegionServer().
getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:"; + port +
- "/index.html"), "Region Server");
+ "/index.html"), "regionserver");
}
private void assertHasExpectedContent(final URL u, final String expected)
@@ -71,6 +71,6 @@
}
bis.close();
String content = sb.toString();
- assertTrue(content.matches(expected));
+ assertTrue(content.contains(expected));
}
}
\ No newline at end of file
