MAPREDUCE-2200. TestUmbilicalProtocolWithJobToken is failing without Krb evironment: needs to be conditional. Contributed by Konstantin Boudnik.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1038878 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 75ea117..147e89c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,9 @@
MAPREDUCE-2199. build is broken 0.22 branch creation. (cos)
+ MAPREDUCE-2200. TestUmbilicalProtocolWithJobToken is failing without Krb
+ evironment: needs to be conditional. (cos)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
diff --git a/build.xml b/build.xml
index 3ea7192..a37af36 100644
--- a/build.xml
+++ b/build.xml
@@ -668,6 +668,8 @@
errorProperty="tests.failed" failureProperty="tests.failed">
<jvmarg value="${test.junit.jvmargs}" />
<sysproperty key="test.build.data" value="@{test.dir}/data"/>
+ <sysproperty key="java.security.krb5.conf"
+ value="${test.src.dir}/krb5.conf"/>
<sysproperty key="test.tools.input.dir" value = "${test.tools.input.dir}"/>
<sysproperty key="test.cache.data" value="${test.cache.data}"/>
<sysproperty key="test.debug.data" value="${test.debug.data}"/>
diff --git a/src/test/krb5.conf b/src/test/krb5.conf
new file mode 100644
index 0000000..9f4b9ad
--- /dev/null
+++ b/src/test/krb5.conf
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+[libdefaults]
+ default_realm = APACHE.ORG
+ udp_preference_limit = 1
+ extra_addresses = 127.0.0.1
+[realms]
+ APACHE.ORG = {
+ admin_server = localhost:88
+ kdc = localhost:88
+ }
+[domain_realm]
+ localhost = APACHE.ORG