Merge branch 'devel' into feature_constructed-inventory

awx/main/credential_plugins/conjur.py

@@ -70,7 +70,8 @@ def conjur_backend(**kwargs):
         auth_kwargs['verify'] = cert
         try:
             resp = requests.post(urljoin(url, '/'.join(['authn', account, username, 'authenticate'])), **auth_kwargs)
-        except requests.exceptions.ConnectionError:
+            resp.raise_for_status()
+        except requests.exceptions.HTTPError:
             resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs)
     raise_for_status(resp)
     token = resp.content.decode('utf-8')
@@ -92,7 +93,8 @@ def conjur_backend(**kwargs):
         lookup_kwargs['verify'] = cert
         try:
             resp = requests.get(path, timeout=30, **lookup_kwargs)
-        except requests.exceptions.ConnectionError:
+            resp.raise_for_status()
+        except requests.exceptions.HTTPError:
             resp = requests.get(path_conjurcloud, timeout=30, **lookup_kwargs)
     raise_for_status(resp)
     return resp.text

awx/main/dispatch/worker/callback.py

@@ -154,6 +154,8 @@ class CallbackBrokerWorker(BaseWorker):
             metrics_events_missing_created = 0
             metrics_total_job_event_processing_seconds = datetime.timedelta(seconds=0)
             for cls, events in self.buff.items():
+                if not events:
+                    continue
                 logger.debug(f'{cls.__name__}.objects.bulk_create({len(events)})')
                 for e in events:
                     e.modified = now  # this can be set before created because now is set above on line 149

awx/main/tests/functional/commands/test_callback_receiver.py

@@ -116,6 +116,13 @@ class TestCallbackBrokerWorker(TransactionTestCase):
         assert worker.buff.get(InventoryUpdateEvent, []) == []
         assert InventoryUpdateEvent.objects.filter(uuid=events[0].uuid).count() == 0  # sanity
 
+    def test_flush_with_empty_buffer(self):
+        worker = self.get_worker()
+        worker.buff = {InventoryUpdateEvent: []}
+        with mock.patch.object(InventoryUpdateEvent.objects, 'bulk_create') as flush_mock:
+            worker.flush()
+        flush_mock.assert_not_called()
+
     def test_postgres_invalid_NUL_char(self):
         # In postgres, text fields reject NUL character, 0x00
         # tests use sqlite3 which will not raise an error