Fix safe exit test (#736)

* ask Jenkins only for quietingDown
* don't wait for jenkins exit

jenkinsapi/jenkins.py

@@ -621,9 +621,9 @@ def credentials_by_id(self):
 
  @property
  def is_quieting_down(self):
- url = '%s/api/python' % (self.baseurl,)
+ url = '%s/api/python?tree=quietingDown' % (self.baseurl,)
  data = self.get_data(url=url)
- return data['quietingDown']
+ return data.get('quietingDown', False)
 
  def shutdown(self):
  url = "%s/exit" % self.baseurl

jenkinsapi/plugins.py

@@ -50,7 +50,7 @@ def check_updates_server(self):
 
  @property
  def update_center_dict(self):
- update_center = 'https://updates.jenkins-ci.org/update-center.json'
+ update_center = 'https://updates.jenkins.io/update-center.json'
  jsonp = requests.get(update_center).content.decode('utf-8')
  return json.loads(jsonp_to_json(jsonp))
 

jenkinsapi_tests/systests/test_safe_exit.py

@@ -26,16 +26,18 @@ def test_safe_exit(jenkins):
  assert build.is_running()
 
  # A job is now running and safe_exit should await running jobs
- # Call, but wait only for 10 seconds then cancel exit
- jenkins.safe_exit(max_wait=10)
+ # Call, but wait only for 5 seconds then cancel exit
+ jenkins.safe_exit(wait_for_exit=False)
+ time.sleep(5)
 
  jenkins.cancel_quiet_down() # leave quietDown mode
  assert jenkins.is_quieting_down is False
 
  build.stop()
  # if we call next line right away - Jenkins have no time to stop job
  # so we wait a bit
- time.sleep(5)
+ while build.is_running():
+ time.sleep(0.5)
 
  console = build.get_console()
  assert isinstance(console, str)

jenkinsapi_utils/jenkins_launcher.py

@@ -65,10 +65,10 @@ class JenkinsLancher(object):
  Launch jenkins
  """
  JENKINS_WEEKLY_WAR_URL = (
- "https://mirrors.jenkins-ci.org/war/latest/jenkins.war"
+ "https://updates.jenkins.io/latest/jenkins.war"
  )
  JENKINS_LTS_WAR_URL = (
- "http:https://mirrors.jenkins-ci.org/war-stable/latest/jenkins.war"
+ "https:https://updates.jenkins.io/stable/latest/jenkins.war"
  )
 
  def __init__(self, local_orig_dir, systests_dir, war_name, plugin_urls=None,