HADOOP-15282. HADOOP-15235 broke TestHttpFSServerWebServer Signed-off-by: Akira Ajisaka <aajis...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/21176a8b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/21176a8b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/21176a8b Branch: refs/heads/HDFS-7240 Commit: 21176a8ba7aa8acc4b1fe04c013b8716c2b25aa7 Parents: 3dc30bc Author: Robert Kanter <rkan...@cloudera.com> Authored: Sun Mar 4 07:33:47 2018 -0800 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Sun Mar 4 07:33:47 2018 -0800 ---------------------------------------------------------------------- .../hadoop/fs/http/server/TestHttpFSServerWebServer.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/21176a8b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java index ddaeedb..a058766 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java @@ -22,9 +22,12 @@ import java.io.File; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.Charset; import java.text.MessageFormat; +import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.security.authentication.server.AuthenticationFilter; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.HadoopUsersConfTestHelper; import org.junit.Assert; @@ -57,7 +60,8 @@ public class TestHttpFSServerWebServer { System.setProperty("httpfs.home.dir", homeDir.getAbsolutePath()); System.setProperty("httpfs.log.dir", logsDir.getAbsolutePath()); System.setProperty("httpfs.config.dir", confDir.getAbsolutePath()); - new File(confDir, "httpfs-signature.secret").createNewFile(); + FileUtils.writeStringToFile(new File(confDir, "httpfs-signature.secret"), + "foo", Charset.forName("UTF-8")); } @Before @@ -65,6 +69,8 @@ public class TestHttpFSServerWebServer { Configuration conf = new Configuration(); conf.set(HttpFSServerWebServer.HTTP_HOSTNAME_KEY, "localhost"); conf.setInt(HttpFSServerWebServer.HTTP_PORT_KEY, 0); + conf.set(AuthenticationFilter.SIGNATURE_SECRET_FILE, + "httpfs-signature.secret"); Configuration sslConf = new Configuration(); webServer = new HttpFSServerWebServer(conf, sslConf); } @@ -76,7 +82,7 @@ public class TestHttpFSServerWebServer { URL url = new URL(webServer.getUrl(), MessageFormat.format( "/webhdfs/v1/?user.name={0}&op=liststatus", user)); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - Assert.assertEquals(conn.getResponseCode(), HttpURLConnection.HTTP_OK); + Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); BufferedReader reader = new BufferedReader( new InputStreamReader(conn.getInputStream())); reader.readLine(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
