Merge lp:~adeuring/charmworld/1192559-forgotten-jenkins-results into lp:~juju-jitsu/charmworld/trunk

[Abel Deuring]

do not drop old charm test results when the Jenkins server can't be reached.

This branch has a trivial fix of an error of the ingest worker:

charm['tests'] and charm['test_results] are set to an empty dictionary in update_jenkins_data(); when store_provider_results() (called by update_jenkins_data()) raises an exception, no test data is added for the current provider. This may result in completely missing test data. The fix is obvious, I think.

[Aaron Bentley (abentley)]

review: Approve

[Charmworld Lander (charmworld-lander)]

No commit message specified.

=== modified file 'charmworld/jobs/ingest.py'
--- charmworld/jobs/ingest.py	2013-06-25 15:18:42 +0000
+++ charmworld/jobs/ingest.py	2013-06-27 15:02:27 +0000
@@ -324,8 +324,8 @@
     if not charm['promulgated']:
         return
 
-    charm['tests'] = {}
-    charm['test_results'] = {}
+    charm.setdefault('tests', {})
+    charm.setdefault('test_results', {})
 
     for p in JENKINS_PROVIDERS:
         try:

=== modified file 'charmworld/jobs/tests/test_jenkins.py'
--- charmworld/jobs/tests/test_jenkins.py	2013-06-24 15:08:43 +0000
+++ charmworld/jobs/tests/test_jenkins.py	2013-06-27 15:02:27 +0000
@@ -68,6 +68,36 @@
                 'promulgated': False,
             })
 
+    def test_jenkins_error(self):
+        # Old test data is retained if store_provider_results() fails,
+        # for example, if the Jenkins server is unreachable.
+        expected_test_status = {
+            'ec2': 'SUCCESS',
+            'openstack': 'SUCCESS',
+            'local': 'FAIL',
+        }
+        expected_test_results = {
+            'ec2': 'whatever',
+            'openstack': 'whatever',
+            'local': 'whatever',
+        }
+        charm = {
+            'branch_spec': '~charmers',
+            'promulgated': True,
+            'tests': expected_test_status.copy(),
+            'test_results': expected_test_results.copy(),
+        }
+
+        def failing_store_provider_results(*args):
+            raise ValueError
+
+        with patch.object(ingest, 'store_provider_results',
+                          failing_store_provider_results):
+            update_jenkins_data(self.db, charm, self.log)
+
+        self.assertEqual(expected_test_status, charm['tests'])
+        self.assertEqual(expected_test_results, charm['test_results'])
+
     def test_store_results(self):
         self.url_result_map = dict([
             _data_file(