From d3be6d0ecc59ae8941d67472f520e18e26362cc7 Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Fri, 22 Oct 2010 09:46:38 -0700
Subject: [PATCH] Replace Linux os-name in test nodes so that filters don't
 conflict with actual build node entry if it is Linux

---
 .../src/test/com/dtolabs/rundeck/core/cli/TestExecTool.java | 6 +++---
 .../com/dtolabs/rundeck/core/cli/test-run-exec-nodes.xml    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/test/com/dtolabs/rundeck/core/cli/TestExecTool.java b/core/src/test/com/dtolabs/rundeck/core/cli/TestExecTool.java
index df0de88adc3..8a620076708 100644
--- a/core/src/test/com/dtolabs/rundeck/core/cli/TestExecTool.java
+++ b/core/src/test/com/dtolabs/rundeck/core/cli/TestExecTool.java
@@ -209,7 +209,7 @@ public void testParseNodeDispatchArgs() throws Exception {
         //use mix of include and exclude
         {
             ExecTool main = new ExecTool();
-            main.parseArgs(new String[]{"-p", TEST_EXEC_TOOL_PROJECT, "-X", "strongbad", "-I", "os-name=Linux"});
+            main.parseArgs(new String[]{"-p", TEST_EXEC_TOOL_PROJECT, "-X", "strongbad", "-I", "os-name=Testux"});
 
             Map exmap = main.parseExcludeArgs(nodeKeys);
             Map incmap = main.parseIncludeArgs(nodeKeys);
@@ -218,7 +218,7 @@ public void testParseNodeDispatchArgs() throws Exception {
             assertTrue("doesn't contain hostname entry", exmap.containsKey("hostname"));
             assertEquals("doesn't contain correct value", "strongbad", exmap.get("hostname"));
             assertTrue("doesn't contain os-name entry", incmap.containsKey("os-name"));
-            assertEquals("doesn't contain correct value", "Linux", incmap.get("os-name"));
+            assertEquals("doesn't contain correct value", "Testux", incmap.get("os-name"));
         }
     }
 
@@ -237,7 +237,7 @@ public void testListAction() {
         }
         {
             ExecTool main = new ExecTool();
-            main.parseArgs(new String[]{"-p", TEST_EXEC_TOOL_PROJECT, "-X", "homestar", "-I", "os-name=Linux"});
+            main.parseArgs(new String[]{"-p", TEST_EXEC_TOOL_PROJECT, "-X", "homestar", "-I", "os-name=Testux"});
             Map exmap = main.parseExcludeArgs(nodeKeys);
             Map incmap = main.parseIncludeArgs(nodeKeys);
             NodeSet nodeset = main.createNodeSet(incmap, exmap);
diff --git a/core/src/test/com/dtolabs/rundeck/core/cli/test-run-exec-nodes.xml b/core/src/test/com/dtolabs/rundeck/core/cli/test-run-exec-nodes.xml
index 075a4c353a4..d5cd477781a 100644
--- a/core/src/test/com/dtolabs/rundeck/core/cli/test-run-exec-nodes.xml
+++ b/core/src/test/com/dtolabs/rundeck/core/cli/test-run-exec-nodes.xml
@@ -21,7 +21,7 @@
         hostname="homestar"
         osArch="arm"
         osFamily="unix"
-        osName="Linux"
+        osName="Testux"
         osVersion="10.5.1"
         username="username1"
       >
@@ -31,7 +31,7 @@
         hostname="the@cheat"
         osArch="i386"
         osFamily="unix"
-        osName="Linux"
+        osName="Testux"
         osVersion="5.1"
       >
 
@@ -40,7 +40,7 @@
         hostname="strongbad"
         osArch="i686"
         osFamily="unix"
-        osName="Mac OS X"
+        osName="Mac OS Xzz"
         osVersion="3.7"
       >