summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-17 17:01:30 +0000
committerGerrit Code Review <review@openstack.org>2018-07-17 17:01:30 +0000
commit7acc67fffe47f813283b6295c3a31c13c5fb7d53 (patch)
treef9064d82e9358f6eeffca9f1fb91ae31c5d36943 /tests
parente12061e88197c750228f1fd16e61689af0659ed5 (diff)
parent0411adde25d728c2feab806b1a1aa6d405cc6c69 (diff)
downloadpython-jenkins-job-builder-7acc67fffe47f813283b6295c3a31c13c5fb7d53.tar.gz
python-jenkins-job-builder-7acc67fffe47f813283b6295c3a31c13c5fb7d53.tar.xz
python-jenkins-job-builder-7acc67fffe47f813283b6295c3a31c13c5fb7d53.zip
Merge "Add support for few of Extra Columns plugin' extra columns for ListView generator"
Diffstat (limited to 'tests')
-rw-r--r--tests/views/fixtures/view_list001.xml30
-rw-r--r--tests/views/fixtures/view_list001.yaml12
-rw-r--r--tests/views/fixtures/view_list002.xml4
-rw-r--r--tests/views/fixtures/view_list002.yaml1
4 files changed, 47 insertions, 0 deletions
diff --git a/tests/views/fixtures/view_list001.xml b/tests/views/fixtures/view_list001.xml
index abec0664..1d74edf8 100644
--- a/tests/views/fixtures/view_list001.xml
+++ b/tests/views/fixtures/view_list001.xml
@@ -31,6 +31,36 @@
<jenkins.branch.DescriptionColumn/>
<com.sonatype.insight.ci.hudson.QualityColumn plugin="sonatype-clm-ci"/>
<com.barchart.jenkins.cascade.GraphViewColumn plugin="maven-release-cascade"/>
+ <jenkins.plugins.extracolumns.TestResultColumn plugin="extra-columns">
+ <testResultFormat>2</testResultFormat>
+ </jenkins.plugins.extracolumns.TestResultColumn>
+ <jenkins.plugins.extracolumns.TestResultColumn plugin="extra-columns">
+ <testResultFormat>3</testResultFormat>
+ </jenkins.plugins.extracolumns.TestResultColumn>
+ <jenkins.plugins.extracolumns.TestResultColumn plugin="extra-columns">
+ <testResultFormat>4</testResultFormat>
+ </jenkins.plugins.extracolumns.TestResultColumn>
+ <jenkins.plugins.extracolumns.TestResultColumn plugin="extra-columns">
+ <testResultFormat>5</testResultFormat>
+ </jenkins.plugins.extracolumns.TestResultColumn>
+ <jenkins.plugins.extracolumns.TestResultColumn plugin="extra-columns">
+ <testResultFormat>0</testResultFormat>
+ </jenkins.plugins.extracolumns.TestResultColumn>
+ <jenkins.plugins.extracolumns.TestResultColumn plugin="extra-columns">
+ <testResultFormat>1</testResultFormat>
+ </jenkins.plugins.extracolumns.TestResultColumn>
+ <jenkins.plugins.extracolumns.BuildParametersColumn plugin="extra-columns">
+ <singlePara>false</singlePara>
+ <parameterName/>
+ </jenkins.plugins.extracolumns.BuildParametersColumn>
+ <jenkins.plugins.extracolumns.BuildDescriptionColumn plugin="extra-columns">
+ <columnWidth>3</columnWidth>
+ <forceWidth>false</forceWidth>
+ </jenkins.plugins.extracolumns.BuildDescriptionColumn>
+ <jenkins.plugins.extracolumns.UserNameColumn plugin="extra-columns"/>
+ <jenkins.plugins.extracolumns.WorkspaceColumn plugin="extra-columns"/>
+ <jenkins.plugins.extracolumns.ConfigureProjectColumn plugin="extra-columns"/>
+ <jenkins.plugins.extracolumns.LastBuildConsoleColumn plugin="extra-columns"/>
</columns>
<recurse>true</recurse>
<statusFilter>false</statusFilter>
diff --git a/tests/views/fixtures/view_list001.yaml b/tests/views/fixtures/view_list001.yaml
index 38e88bf2..5067bc18 100644
--- a/tests/views/fixtures/view_list001.yaml
+++ b/tests/views/fixtures/view_list001.yaml
@@ -26,5 +26,17 @@ columns:
- desc
- policy-violations
- member-graph-view
+ - extra-tests-total
+ - extra-tests-failed
+ - extra-tests-passed
+ - extra-tests-skipped
+ - extra-tests-format-0
+ - extra-tests-format-1
+ - extra-build-parameters
+ - extra-build-description
+ - extra-last-user-name
+ - extra-workspace-link
+ - extra-configure-button
+ - extra-last-output
recurse: true
status-filter: false
diff --git a/tests/views/fixtures/view_list002.xml b/tests/views/fixtures/view_list002.xml
index c3b028e4..52ccb81b 100644
--- a/tests/views/fixtures/view_list002.xml
+++ b/tests/views/fixtures/view_list002.xml
@@ -16,6 +16,10 @@
<hudson.views.LastSuccessColumn/>
<hudson.views.LastFailureColumn/>
<hudson.views.LastDurationColumn/>
+ <jenkins.plugins.extracolumns.BuildParametersColumn plugin="extra-columns">
+ <singlePara>true</singlePara>
+ <parameterName>MY_PARAMETER</parameterName>
+ </jenkins.plugins.extracolumns.BuildParametersColumn>
</columns>
<includeRegex>(?!test.*).*</includeRegex>
<recurse>false</recurse>
diff --git a/tests/views/fixtures/view_list002.yaml b/tests/views/fixtures/view_list002.yaml
index 11e858ef..880d287a 100644
--- a/tests/views/fixtures/view_list002.yaml
+++ b/tests/views/fixtures/view_list002.yaml
@@ -8,4 +8,5 @@ columns:
- last-success
- last-failure
- last-duration
+ - extra-build-parameter: MY_PARAMETER
regex: (?!test.*).*