[JENKINS-27268] Fix tests after renaming

jenkinsci · Jan 28, 2016 · 317d788 · 317d788
1 parent 262cd1f
commit 317d788
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
@@ -60,7 +60,7 @@ public class CreateNodeCommandTest {
                 .invoke()
         ;
 
-        assertThat(result.stderr(), containsString("user is missing the Slave/Create permission"));
+        assertThat(result.stderr(), containsString("user is missing the Agent/Create permission"));
         assertThat(result, hasNoStandardOutput());
         assertThat(result, failedWith(-1));
     }

diff --git a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
@@ -62,7 +62,7 @@ public class DeleteNodeCommandTest {
 
         assertThat(result, failedWith(-1));
         assertThat(result, hasNoStandardOutput());
-        assertThat(result.stderr(), containsString("user is missing the Slave/Delete permission"));
+        assertThat(result.stderr(), containsString("user is missing the Agent/Delete permission"));
     }
 
     @Test public void deleteNodeShouldSucceed() throws Exception {

diff --git a/test/src/test/java/hudson/cli/GetNodeCommandTest.java b/test/src/test/java/hudson/cli/GetNodeCommandTest.java
@@ -59,7 +59,7 @@ public class GetNodeCommandTest {
                 .invokeWithArgs("MySlave")
         ;
 
-        assertThat(result.stderr(), containsString("user is missing the Slave/ExtendedRead permission"));
+        assertThat(result.stderr(), containsString("user is missing the Agent/ExtendedRead permission"));
         assertThat(result, failedWith(-1));
         assertThat(result, hasNoStandardOutput());
     }

diff --git a/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java b/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
@@ -65,7 +65,7 @@ public class OnlineNodeCommandTest {
 
         assertThat(result, failedWith(1));
         assertThat(result, hasNoStandardOutput());
-        assertThat(result.stderr(), containsString("user is missing the Slave/Connect permission"));
+        assertThat(result.stderr(), containsString("user is missing the Agent/Connect permission"));
     }
 
     @Test public void onlineNodeShouldFailIfNodeDoesNotExist() throws Exception {
@@ -74,7 +74,7 @@ public class OnlineNodeCommandTest {
                 .invokeWithArgs("never_created");
         assertThat(result, failedWith(1));
         assertThat(result, hasNoStandardOutput());
-        assertThat(result.stderr(), containsString("No such slave \"never_created\" exists."));
+        assertThat(result.stderr(), containsString("No such agent \"never_created\" exists."));
 
     }
 

diff --git a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
@@ -60,7 +60,7 @@ public class UpdateNodeCommandTest {
                 .invokeWithArgs("MySlave")
         ;
 
-        assertThat(result.stderr(), containsString("user is missing the Slave/Configure permission"));
+        assertThat(result.stderr(), containsString("user is missing the Agent/Configure permission"));
         assertThat(result, failedWith(-1));
         assertThat(result, hasNoStandardOutput());
     }

diff --git a/test/src/test/java/hudson/model/ComputerTest.java b/test/src/test/java/hudson/model/ComputerTest.java
@@ -84,7 +84,7 @@ public void testProhibitRenameOverExistingNode() throws Exception {
         } catch (FailingHttpStatusCodeException e) {
             assertThat(NOTE, e.getStatusCode(), equalTo(400));
             assertThat(NOTE, e.getResponse().getContentAsString(),
-                    containsString("Slave called ‘nodeA’ already exists"));
+                    containsString("Agent called ‘nodeA’ already exists"));
         }
     }
 }