jjb
/
jenkins-job-builder
Code Issues Proposed changes

Symlink folders001.xml to deduplicate the test xml 

Change-Id: Id03b1a147303cc377a48be25ba93f97cab856a8c
Co-Authored-By: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
This commit is contained in:
Sorin Sbarnea 2018-06-29 09:14:58 -04:00 committed by Thanh Ha
parent 3841555ab5
commit 14011df16e
No known key found for this signature in database
GPG Key ID: B0CB27E00DA095AA
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/base.py
View File

@ -246,7 +246,7 @@ class SingleJobTestCase(BaseScenariosTestCase):
def test_yaml_snippet(self):
config = self._get_config()
expected_xml = self._read_utf8_content()
expected_xml = self._read_utf8_content().strip()
parser = YamlParser(config)
parser.parse(self.in_filename)
@ -290,7 +290,7 @@ class SingleJobTestCase(BaseScenariosTestCase):
# Prettify generated XML
pretty_xml = u"\n".join(job.output().decode('utf-8')
for job in xml_jobs)
for job in xml_jobs).strip()
self.assertThat(
pretty_xml,

15
tests/yamlparser/fixtures/folders001.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<actions/>
<description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
<keepDependencies>false</keepDependencies>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
<properties/>
<scm class="hudson.scm.NullSCM"/>
<builders/>
<publishers/>
<buildWrappers/>
</project>

1
tests/yamlparser/fixtures/folders001.xml Symbolic link
View File

@ -0,0 +1 @@
folders/folders001.xml