Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Tests, compatibility with Ubuntu 24.04 #2557

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Fix Tests, compatibility with Ubuntu 24.04 #2557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
528a376
pytest full: Version-independent install of postgres client
sebix Jan 27, 2025
5381990
tst: update gethostbyname expert data
sebix Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scripts/setup-full.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 11 additions & 11 deletions intelmq/tests/bots/experts/gethostbyname/test_expert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
Loading