diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-12-10 18:50:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-12-10 21:58:19 +0100 |
| commit | e335b8ae803a5a0f28a692edc0349ababa490445 (patch) | |
| tree | 753f3d62d0aaa2ab6a831f8dcfa525d714868d0c /src/platform/tests | |
| parent | 69385b013384918a005052098d5beae003b4c8d3 (diff) | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
Import Debian changes 1.12.6-0ubuntu1
network-manager (1.12.6-0ubuntu1) disco; urgency=medium
* New upstream version
- Fix a vulnerability in the internal DHCPv6 client (CVE-2018-15688).
* debian/patches/git_mac_change.patch:
- backported a regression fix from upstream git
[ Alfonso Sanchez-Beato ]
* Import some WoWLAN patches from the newer stable serie (LP: #1781597)
Diffstat (limited to 'src/platform/tests')
| -rw-r--r-- | src/platform/tests/test-cleanup.c | 2 | ||||
| -rw-r--r-- | src/platform/tests/test-common.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/platform/tests/test-cleanup.c b/src/platform/tests/test-cleanup.c index 8b8c87d8..12d91812 100644 --- a/src/platform/tests/test-cleanup.c +++ b/src/platform/tests/test-cleanup.c @@ -60,7 +60,7 @@ test_cleanup_internal (void) g_assert (ifindex > 0); /* wait for kernel to add the IPv6 link local address... it takes a bit. */ - NMTST_WAIT_ASSERT (100, { + NMTST_WAIT_ASSERT (300, { gs_unref_array GArray *addrs = NULL; const NMPlatformIP6Address *a; diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 42569d5b..1095a2b1 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -787,8 +787,6 @@ nmtstp_ip_address_assert_lifetime (const NMPlatformIPAddress *addr, if (lft == NM_PLATFORM_LIFETIME_PERMANENT) g_assert_cmpint (adr, ==, NM_PLATFORM_LIFETIME_PERMANENT); else { - g_assert_cmpint (adr, <=, lft); - g_assert_cmpint (offset, <=, adr); g_assert_cmpint (adr - offset, <=, lft + CHECK_LIFETIME_MAX_DIFF); g_assert_cmpint (adr - offset, >=, lft - CHECK_LIFETIME_MAX_DIFF); } |