From 7c65dbb9385567fe1d8e280b81ecb97b109d18a8 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Mon, 1 Apr 2013 20:57:02 +0000 Subject: [PATCH] YARN-524 TestYarnVersionInfo failing if generated properties doesn't include an SVN URL git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463300 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/util/TestYarnVersionInfo.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 872edaf676..9d97c899b6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -54,6 +54,9 @@ Trunk - Unreleased YARN-359. Fixing commands for container signalling in Windows. (Chris Nauroth via vinodkv) + + YARN-524 TestYarnVersionInfo failing if generated properties doesn't + include an SVN URL(stevel) Release 2.0.5-beta - UNRELEASED diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestYarnVersionInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestYarnVersionInfo.java index 73d7ff6d34..61795cae35 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestYarnVersionInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestYarnVersionInfo.java @@ -40,11 +40,11 @@ public class TestYarnVersionInfo extends TestCase { // make sure they aren't Unknown assertTrue("getVersion returned Unknown", !YarnVersionInfo.getVersion().equals("Unknown")); assertTrue("getUser returned Unknown", !YarnVersionInfo.getUser().equals("Unknown")); - assertTrue("getUrl returned Unknown", !YarnVersionInfo.getUrl().equals("Unknown")); assertTrue("getSrcChecksum returned Unknown", !YarnVersionInfo.getSrcChecksum().equals("Unknown")); // these could be Unknown if the VersionInfo generated from code not in svn or git // so just check that they return something + assertNotNull("getUrl returned null", YarnVersionInfo.getUrl()); assertNotNull("getRevision returned null", YarnVersionInfo.getRevision()); assertNotNull("getBranch returned null", YarnVersionInfo.getBranch());