Moved the empty job config into the config
authorSalim Fadhley <sal@stodge.org>
Sun, 23 Jun 2013 08:26:01 +0000 (09:26 +0100)
committerSalim Fadhley <sal@stodge.org>
Sun, 23 Jun 2013 20:21:53 +0000 (21:21 +0100)
jenkinsapi_tests/systests/base.py
jenkinsapi_tests/systests/job_configs.py

index 4a24d43..b434122 100644 (file)
@@ -1,27 +1,8 @@
 import unittest
+from jenkinsapi.jenkinsapi_tests.systests.job_configs import EMPTY_JOB
 from jenkinsapi.jenkins import Jenkins
 
 
-EMPTY_JOB_CONFIG = '''\
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties/>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector"/>
-  <concurrentBuild>false</concurrentBuild>
-  <builders/>
-  <publishers/>
-  <buildWrappers/>
-</project>
-'''
-
 
 class BaseSystemTest(unittest.TestCase):
 
@@ -43,7 +24,7 @@ class BaseSystemTest(unittest.TestCase):
         for name in all_view_names:
             del self.jenkins.views()[name]
 
-    def _create_job(self, name='whatever', config=EMPTY_JOB_CONFIG):
+    def _create_job(self, name='whatever', config=EMPTY_JOB):
         job = self.jenkins.create_job(name, config)
         self.jenkins.poll()
         return job
index f4ff6f3..9008cb9 100644 (file)
@@ -1,3 +1,23 @@
+EMPTY_JOB = '''\
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</project>
+'''.strip()
+
 LONG_RUNNING_JOB = JOB_XML = """
 <?xml version='1.0' encoding='UTF-8'?>
 <project>