diff options
| author | John Högberg <[email protected]> | 2018-02-28 09:09:35 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-02-28 09:09:35 +0100 |
| commit | b600910bf17c92721fb8da04e8c508d6395dabc4 (patch) | |
| tree | b43e3a0ed98c73e1bed4a5c9e3b583a2e1d14b0d | |
| parent | db8ad9dbc43669a134ce515a23ba6f8881b8a4a8 (diff) | |
| parent | 5e0c4f113f229b54c8177874032e4528e55bddac (diff) | |
| download | otp-b600910bf17c92721fb8da04e8c508d6395dabc4.tar.gz otp-b600910bf17c92721fb8da04e8c508d6395dabc4.tar.bz2 otp-b600910bf17c92721fb8da04e8c508d6395dabc4.zip | |
Merge branch 'john/kernel/skip-testing-unavailable-interfaces' into maint
* john/kernel/skip-testing-unavailable-interfaces:
Skip testing unavailable interfaces in inet_SUITE:getifaddrs
| -rw-r--r-- | lib/kernel/test/inet_SUITE.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl index 3b502be8b8..ba0d075ef2 100644 --- a/lib/kernel/test/inet_SUITE.erl +++ b/lib/kernel/test/inet_SUITE.erl @@ -1083,11 +1083,9 @@ ifaddrs([{If,Opts}|IOs]) -> #ifopts{flags=F} = Ifopts = check_ifopts(Opts, #ifopts{name=If}), case F of {flags,Flags} -> - case lists:member(up, Flags) of - true -> - Ifopts#ifopts.addrs; - false -> - [] + case lists:member(running, Flags) of + true -> Ifopts#ifopts.addrs; + false -> [] end ++ ifaddrs(IOs); undefined -> ifaddrs(IOs) |