Skip to content

Commit 0f06fc2

Browse files
janfaraciktimja
andauthored
Adapt to removal of built-in executor config from global system configuration (#2211)
Co-authored-by: Tim Jacomb <[email protected]>
1 parent f120943 commit 0f06fc2

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

src/main/java/org/jenkinsci/test/acceptance/po/JenkinsConfig.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
public class JenkinsConfig extends ConfigurablePageObject {
1212
public final Jenkins jenkins;
1313

14-
public final Control numExecutors = control("/jenkins-model-MasterBuildConfiguration/numExecutors");
15-
16-
public final Control labels = control("/jenkins-model-MasterBuildConfiguration/labelString");
14+
public final Control quietPeriod = control("/jenkins-model-GlobalQuietPeriodConfiguration/quietPeriod");
1715

1816
public JenkinsConfig(Jenkins jenkins) {
1917
super(jenkins.injector, jenkins.url("configure"));
@@ -45,7 +43,7 @@ public void setShell(String path) {
4543
}
4644

4745
public void setQuietPeriod(int seconds) {
48-
control("/jenkins-model-GlobalQuietPeriodConfiguration/quietPeriod").set(seconds);
46+
quietPeriod.set(seconds);
4947
}
5048

5149
public void setDescription(String desc) {

src/test/java/core/FormValidationTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ private void ajaxValidation() {
6060
private void jsValidation() {
6161
JenkinsConfig c = jenkins.getConfigPage();
6262
c.configure();
63-
c.numExecutors.set(16);
64-
FormValidation formValidation = c.numExecutors.getSilentFormValidation();
63+
c.setQuietPeriod(16);
64+
FormValidation formValidation = c.quietPeriod.getSilentFormValidation();
6565
assertThat(formValidation, silent());
6666

67-
c.numExecutors.set(-16);
68-
c.numExecutors.resolve().sendKeys(Keys.TAB);
69-
c.numExecutors.sleep(100L);
70-
formValidation = c.numExecutors.getFormValidation();
67+
c.setQuietPeriod(-16);
68+
c.quietPeriod.resolve().sendKeys(Keys.TAB);
69+
c.quietPeriod.sleep(100L);
70+
formValidation = c.quietPeriod.getFormValidation();
7171

72-
String errorMessage = "Not a non-negative integer";
72+
String errorMessage = "This value should be larger than 0";
7373
assertThat(formValidation, reports(Kind.ERROR, errorMessage));
7474
}
7575

src/test/java/plugins/PrioritySorterPluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void saving_global_config_should_not_create_job_change() {
112112

113113
final JenkinsConfig global = jenkins.getConfigPage();
114114
global.configure();
115-
global.numExecutors.set(42);
115+
global.setDescription("Testing");
116116
global.save();
117117

118118
assertThat(action.getChanges().size(), equalTo(expected));

0 commit comments

Comments
 (0)