b57cf27103
Bump tox from 4.12.1 to 4.13.0 in /test ( #5581 )
2024-02-24 13:44:20 +01:00
f5e6364f98
Bump tox from 4.12.1 to 4.13.0 in /test ( #5584 )
2024-02-24 13:43:34 +01:00
ed1a6278b7
Merge branch 'development-v6' into new/migrate_dnsmasq_conf
2024-02-19 21:29:11 +01:00
b322f1e98b
Bump tox from 4.12.1 to 4.13.0 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.12.1 to 4.13.0.
- [Release notes](https://github.com/tox-dev/tox/releases )
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst )
- [Commits](https://github.com/tox-dev/tox/compare/4.12.1...4.13.0 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-02-17 10:50:41 +00:00
5b75cb1950
Bump tox from 4.12.1 to 4.13.0 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.12.1 to 4.13.0.
- [Release notes](https://github.com/tox-dev/tox/releases )
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst )
- [Commits](https://github.com/tox-dev/tox/compare/4.12.1...4.13.0 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-02-17 10:29:46 +00:00
9ff43040ec
Add list type in pihole -q
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-02-13 09:58:29 +01:00
75fadb9b55
Adlists need to be grouped by both address and type to differentiate between anti-/gravity lists
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-02-13 08:55:26 +01:00
1a59b407e0
Merge branch 'development-v6' into tweak/allow_adlist_dups
2024-02-13 07:47:30 +01:00
c771739f68
Fix gravity ( #5573 )
2024-02-12 06:42:04 +01:00
bcb712b6e3
Fix accidential double -ni from one of the last PRs
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-02-11 21:07:15 +01:00
bb095bb209
Merge development into development-v6 (with merge conflicts resolved) ( #5570 )
2024-02-11 17:11:04 +00:00
b5ab8ac198
Change UNIQUEness constraint from (address) to (address, type) in the adlist table. This will allow certain adlists to be associated to different groups. A possible scenario is an adlist meant to block a specific service (e.g. Twitter, Youtube, etc.). It can then either be used to ensure these services are really blocked on the devices of group A but will never be blocked on devices of group B.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-02-11 16:54:22 +01:00
8b3469cabc
Merge branch 'development-v6' into development-v6-merge-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-02-11 16:41:41 +01:00
aca7b31b83
Remove local.list and openVPN traces ( #5480 )
2024-02-10 06:16:00 +01:00
8f36fdf11c
Make IDs of anti-/gravity lists available in vw_(anti)gravity ( #5526 )
2024-02-09 20:52:29 +01:00
f193edd428
Merge branch 'development' into development-v6-merge-development (resolved conflicts)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-02-09 19:22:53 +00:00
3ba6ab5ec7
Bump pytest from 7.4.4 to 8.0.0 in /test ( #5566 )
2024-02-05 13:53:45 +01:00
f0878c0890
Bump pytest from 7.4.4 to 8.0.0 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.4 to 8.0.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.4...8.0.0 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-02-04 21:39:17 +00:00
2009fa85ec
Fedora ( #5568 )
2024-02-04 21:36:37 +00:00
7b6f0d1596
Also remove Fedora 37
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2024-02-04 16:41:20 +01:00
f8bfd59f11
Drop Fedora 36 and add Fedora 39 to the test suite
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2024-02-04 16:40:12 +01:00
499ba9785f
Bump pytest from 7.4.4 to 8.0.0 in /test ( #5567 )
2024-02-04 16:22:41 +01:00
6e946f76d6
Bump pytest from 7.4.4 to 8.0.0 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.4 to 8.0.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.4...8.0.0 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-02-03 10:21:48 +00:00
92e741fd5a
Test ftl.pi-hole.net availability ( #5563 )
2024-02-02 19:02:54 +01:00
31a8f150b2
Add checking for availability of ftl.pi-hole.net when using FTL from a custom branch. If the server is down (or the user is offline, cannot resolve the domain, etc.), we fail early and hard instead of possibly corrupting the installation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-01-31 08:00:28 +01:00
07b448d784
Also check for IPv6 address for configured DNS servers
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-01-30 19:24:33 +01:00
9a3affd81e
Drop Fedora 36 and add Fedora 39 to the test suite ( #5482 )
2024-01-29 18:21:16 +00:00
935a4ce0b3
Also remove Fedora 37
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2024-01-28 16:56:57 +01:00
cc8f9fe057
Use 204 return code for deleted sessions ( #5541 )
2024-01-27 22:05:09 +01:00
e1c41fe4d5
Bump tox from 4.12.0 to 4.12.1 in /test ( #5556 )
2024-01-20 12:25:01 +01:00
37c6b353b3
Bump tox from 4.12.0 to 4.12.1 in /test ( #5555 )
2024-01-20 12:23:35 +01:00
60de50bb73
Bump tox from 4.12.0 to 4.12.1 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.12.0 to 4.12.1.
- [Release notes](https://github.com/tox-dev/tox/releases )
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst )
- [Commits](https://github.com/tox-dev/tox/compare/4.12.0...4.12.1 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-20 10:49:27 +00:00
ba2682c907
Bump tox from 4.12.0 to 4.12.1 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.12.0 to 4.12.1.
- [Release notes](https://github.com/tox-dev/tox/releases )
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst )
- [Commits](https://github.com/tox-dev/tox/compare/4.12.0...4.12.1 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-20 10:38:21 +00:00
d6dbb40ef1
Do not store remote version in versions file if on custom branch ( #5549 )
2024-01-15 22:09:29 +01:00
47f06dfd71
Do not store remote version in versions file if on custom branch. It's always wrong here
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-01-15 20:53:34 +01:00
e773d0399f
Bump tox from 4.11.4 to 4.12.0 in /test ( #5547 )
2024-01-13 20:42:30 +01:00
ebb0db0a3b
Bump tox from 4.11.4 to 4.12.0 in /test ( #5548 )
2024-01-13 20:40:53 +01:00
b662fd6f01
Bump tox from 4.11.4 to 4.12.0 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.11.4 to 4.12.0.
- [Release notes](https://github.com/tox-dev/tox/releases )
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst )
- [Commits](https://github.com/tox-dev/tox/compare/4.11.4...4.12.0 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-13 10:43:13 +00:00
9eb47319f5
Bump tox from 4.11.4 to 4.12.0 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.11.4 to 4.12.0.
- [Release notes](https://github.com/tox-dev/tox/releases )
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst )
- [Commits](https://github.com/tox-dev/tox/compare/4.11.4...4.12.0 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-13 10:32:36 +00:00
debab10792
Use 204
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2024-01-11 20:42:32 +01:00
b756262ebe
Fix failing tests in development-v6 branch ( #5542 )
2024-01-10 11:14:50 +00:00
e781311f23
pihole -d: Fix gateway ping if it is a LL address ( #5527 )
2024-01-09 19:19:32 +01:00
df9c60e351
Reduce code duplication in FTL arch detect tests.
...
Use parametrize to run the same test with different parameters for each arch we need to test.
Also include detection of unusupported in this test.
Create FTL_BRANCH constant to be used in functions (less places to remember to change it)
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-01-08 18:26:59 +00:00
aa4ceb4198
Sync master back into development ( #5537 )
2024-01-07 21:17:15 +00:00
220c0675ef
As we do in other tests, specify development-v6 branch of FTL is downloaded for the tests. We need to change this to develoment once v6 is released
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-01-07 21:03:48 +00:00
19bfa08b83
Pi-hole core v5.17.3 ( #5520 )
2024-01-06 16:53:38 +00:00
7eb69a5cc8
Bump pytest from 7.4.3 to 7.4.4 in /test ( #5536 )
2024-01-06 11:14:52 +01:00
e14792bc48
Bump pytest from 7.4.3 to 7.4.4 in /test ( #5535 )
2024-01-06 11:14:28 +01:00
05e7d0ee92
Bump pytest from 7.4.3 to 7.4.4 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.3...7.4.4 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-06 10:10:22 +00:00
9c3578856f
Bump pytest from 7.4.3 to 7.4.4 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.3...7.4.4 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-06 10:02:39 +00:00
