From 14011df16e4f82d3a990a65b4e5087dadb8786e6 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Fri, 29 Jun 2018 09:14:58 -0400
Subject: [PATCH] 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>
---
 tests/base.py                            |  4 ++--
 tests/yamlparser/fixtures/folders001.xml | 16 +---------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 mode change 100644 => 120000 tests/yamlparser/fixtures/folders001.xml

diff --git a/tests/base.py b/tests/base.py
index 855f2e754..740e2239a 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -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,
diff --git a/tests/yamlparser/fixtures/folders001.xml b/tests/yamlparser/fixtures/folders001.xml
deleted file mode 100644
index 0570e10a5..000000000
--- a/tests/yamlparser/fixtures/folders001.xml
+++ /dev/null
@@ -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>
diff --git a/tests/yamlparser/fixtures/folders001.xml b/tests/yamlparser/fixtures/folders001.xml
new file mode 120000
index 000000000..e5f891835
--- /dev/null
+++ b/tests/yamlparser/fixtures/folders001.xml
@@ -0,0 +1 @@
+folders/folders001.xml
\ No newline at end of file