Merge branch 'master' into collections

MTG · Feb 3, 2025 · e2bc70a · e2bc70a
2 parents 04ba23d + 3e6e242
commit e2bc70a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -45,9 +45,6 @@ jobs:
     - name: Pull docker images
       run: docker compose -f docker-compose.test.yml pull
 
-    - uses: jpribyl/[email protected]
-      continue-on-error: true
-
     - name: Build base image
       run: make -C docker
 

diff --git a/monitor/tests.py b/monitor/tests.py
@@ -17,7 +17,7 @@ def test_monitor_queries_stats_ajax_error(self, mock_get):
         resp = self.client.get(reverse('monitor-queries-stats-ajax'))
 
         self.assertEqual(resp.status_code, 500)
-        mock_get.assert_called_with('http://graylog/graylog/api/search/universal/relative/terms', auth=mock.ANY, params=mock.ANY)
+        mock_get.assert_called_with('http://graylog/api/search/universal/relative/terms', auth=mock.ANY, params=mock.ANY)
 
     @override_settings(GRAYLOG_DOMAIN='http://graylog')
     @mock.patch('requests.get')
@@ -29,7 +29,7 @@ def test_monitor_queries_stats_ajax_bad_data(self, mock_get):
         resp = self.client.get(reverse('monitor-queries-stats-ajax'))
 
         self.assertEqual(resp.status_code, 500)
-        mock_get.assert_called_with('http://graylog/graylog/api/search/universal/relative/terms', auth=mock.ANY, params=mock.ANY)
+        mock_get.assert_called_with('http://graylog/api/search/universal/relative/terms', auth=mock.ANY, params=mock.ANY)
 
     @override_settings(GRAYLOG_DOMAIN='http://graylog')
     @mock.patch('requests.get')
@@ -43,4 +43,4 @@ def test_monitor_queries_stats_ajax_ok(self, mock_get):
 
         self.assertEqual(resp.status_code, 200)
         self.assertJSONEqual(resp.content, {'response': 'ok'})
-        mock_get.assert_called_with('http://graylog/graylog/api/search/universal/relative/terms', auth=mock.ANY, params=mock.ANY)
+        mock_get.assert_called_with('http://graylog/api/search/universal/relative/terms', auth=mock.ANY, params=mock.ANY)