Merge branch 'hotfix/0.26.2'

Author: Roey Darwish Dror

flask_app/app.yml

@@ -1,4 +1,4 @@
 app_name: scotty
-APP_VERSION: 0.26.1
+APP_VERSION: 0.26.2
 SECURITY_PASSWORD_HASH: sha512_crypt
 SQLALCHEMY_TRACK_MODIFICATIONS: false

flask_app/blueprints/trackers.py

@@ -25,7 +25,7 @@
 })
 def create():
     tracker = request.json['tracker']
-    if tracker['type'] not in ('jira', 'file'):
+    if tracker['type'] not in ('jira', 'file', 'faulty'):
         return 'Bad tracker type', http.client.BAD_REQUEST
 
     tracker_model = Tracker(

flask_app/issue_trackers.py

@@ -17,6 +17,10 @@ def _refresh_file(url, issues):
             issue.open = data[issue.id_in_tracker]
 
 
+def _refresh_faulty():
+    raise Exception("Tracker Error")
+
+
 def _refresh_jira(url, config, issues):
     config = confetti.Config(json.loads(config))
     jira = JIRA(url, basic_auth=(config.root.username, config.root.password))
@@ -42,5 +46,7 @@ def refresh(tracker, issues):
         _refresh_file(tracker.url, issues)
     elif tracker.type == "jira":
         _refresh_jira(tracker.url, tracker.config, issues)
+    elif tracker.type == "faulty":
+        _refresh_faulty()
     else:
         raise ValueError("Unknown tracker type {}".format(tracker.type))

flask_app/tasks.py

@@ -297,14 +297,21 @@ def refresh_issue_trackers():
     for tracker in trackers:
         issues = db.session.query(Issue).filter_by(tracker_id=tracker.id)
         logger.info("Refreshing tracker {} - {} of type {}", tracker.id, tracker.url, tracker.type)
-        issue_trackers.refresh(tracker, issues)
+        try:
+            issue_trackers.refresh(tracker, issues)
+        except Exception:
+            APP.raven.captureException()
+
         db.session.commit()
 
 
 @queue.task
 @needs_app_context
 def nightly():
-    refresh_issue_trackers()
+    try:
+        refresh_issue_trackers()
+    except Exception:
+        APP.raven.captureException()
     vacuum()
     validate_checksum()
 

tests/slashconf.py

@@ -172,6 +172,11 @@ def tracker(scotty):
     return FileTracker.create(scotty)
 
 
+@slash.fixture
+def faulty_tracker(scotty):
+    return scotty.create_tracker('faulty_tracker', 'faulty', '', '')
+
+
 @slash.fixture
 def issue(tracker):
     return tracker.create_issue()

tests/test_deployment/test__vacuum.py

@@ -106,6 +106,38 @@ def test_multiple_issues(tracker, scotty, beam, server_config, long_term_beam):
     scotty.check_beam_state(long_term_beam, False)
 
 
+def test_faulty_tracker(tracker, scotty, beam, issue, server_config, faulty_tracker, local_beam_dir):
+    vacuum_threshold = server_config['VACUUM_THRESHOLD']
+
+    beam = scotty.get_beam(scotty.beam_up(local_beam_dir))
+
+    beam_with_issue = scotty.get_beam(scotty.beam_up(local_beam_dir))
+    beam_with_issue.set_issue_association(issue.id_in_scotty, True)
+    beam_with_issue.update()
+
+    faulty_issue = scotty.create_issue(faulty_tracker, '1')
+    beam_with_faulty_issue = scotty.get_beam(scotty.beam_up(local_beam_dir))
+    beam_with_faulty_issue.set_issue_association(faulty_issue, True)
+    beam_with_faulty_issue.update()
+
+    assert beam_with_issue.purge_time is None
+    assert beam_with_faulty_issue.purge_time is None
+    assert beam.purge_time is vacuum_threshold
+    scotty.sleep(_DAY * vacuum_threshold)
+
+    for beam in [beam_with_faulty_issue, beam_with_faulty_issue, beam]:
+        beam.update()
+
+    scotty.check_beam_state(beam, True)
+    scotty.check_beam_state(beam_with_faulty_issue, False)
+    scotty.check_beam_state(beam_with_issue, False)
+
+    issue.set_state(False)
+    scotty.sleep(_DAY)
+    beam_with_issue.update()
+    scotty.check_beam_state(beam_with_issue, True)
+
+
 def test_multiple_issues_and_multiple_beams(local_beam_dir, tracker, scotty, server_config, long_term_beam):
     vacuum_threshold = server_config['VACUUM_THRESHOLD']
     beam1 = scotty.get_beam(scotty.beam_up(local_beam_dir))