Merge pull request #2557 from sebix/tests-ubuntu-24

Fix Tests, compatibility with Ubuntu 24.04
certtools · Jan 29, 2025 · d3160ce · d3160ce
2 parents 9bfe9bf + 5381990
commit d3160ce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/scripts/setup-full.sh b/.github/workflows/scripts/setup-full.sh
@@ -20,7 +20,7 @@ if [ $python_version == '3.8' ]; then
 	DEBIAN_FRONTEND="noninteractive" sudo -E apt install -y build-essential freetds-dev libssl-dev libkrb5-dev
 fi
 # for psql (used below)
-DEBIAN_FRONTEND="noninteractive" sudo -E apt install -y postgresql-client-14
+DEBIAN_FRONTEND="noninteractive" sudo -E apt install -y postgresql-client
 
 # Install the dependencies of all the bots
 pip install wheel

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - Install `psql` explicitly for workflow support on other platforms such as act (PR#2542 by Sebastian Wagner).
 - Create intelmq user & group if running privileged to allow dropping privileges (PR#2542 by Sebastian Wagner).
 - `intelmq.tests.lib.test_pipeline.TestAmqp.test_acknowledge`: Also skip on Python 3.11 besides on 3.8 when running on CI (PR#2542 by Sebastian Wagner).
+- Full pytest workflow: Version-independent install of postgres client, for Ubuntu 24.04 (default on GitHub now) test environment compatibility (PR#2557 by Sebastian Wagner).
 
 ### Tools
 

diff --git a/intelmq/tests/bots/experts/gethostbyname/test_expert.py b/intelmq/tests/bots/experts/gethostbyname/test_expert.py
@@ -13,15 +13,15 @@
 from intelmq.bots.experts.gethostbyname.expert import GethostbynameExpertBot
 
 EXAMPLE_INPUT = {"__type": "Event",
-                 "source.fqdn": "example.com",
-                 "destination.fqdn": "example.org",
+                 "source.fqdn": "iana.org",
+                 "destination.fqdn": "nic.at",
                  "time.observation": "2015-01-01T00:00:00+00:00"
                  }
 EXAMPLE_OUTPUT = {"__type": "Event",
-                  "source.fqdn": "example.com",
-                  "destination.fqdn": "example.org",
-                  "source.ip": "93.184.215.14",
-                  "destination.ip": "93.184.215.14",
+                  "source.fqdn": "iana.org",
+                  "destination.fqdn": "nic.at",
+                  "source.ip": "192.0.43.8",
+                  "destination.ip": "198.251.90.127",
                   "time.observation": "2015-01-01T00:00:00+00:00"
                   }
 NONEXISTING_INPUT = {"__type": "Event",
@@ -30,15 +30,15 @@
                      "time.observation": "2015-01-01T00:00:00+00:00"
                      }
 EXAMPLE_URL_INPUT = {"__type": "Event",
-                     "source.url": "http://example.com",
+                     "source.url": "http://iana.org",
                      }
 EXAMPLE_URL_OUTPUT = {"__type": "Event",
-                      "source.url": "http://example.com",
-                      "source.ip": "93.184.215.14",
+                      "source.url": "http://iana.org",
+                      "source.ip": "192.0.43.8",
                       }
 EXISITNG_INPUT = {"__type": "Event",
-                  "source.fqdn": "example.com",
-                  "destination.fqdn": "example.org",
+                  "source.fqdn": "iana.org",
+                  "destination.fqdn": "nic.at",
                   "source.ip": "10.0.0.1",
                   "destination.ip": "10.0.0.2",
                   "time.observation": "2015-01-01T00:00:00+00:00"