Skip to content

Commit

Permalink
Merge branch 'nicstats-250' of github.com:giampaolo/psutil into nicst…
Browse files Browse the repository at this point in the history
…ats-250
  • Loading branch information
giampaolo committed Feb 12, 2015
2 parents 093009e + 97f15ca commit 86ffc46
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions test/_linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,6 @@ def test_net_if_addrs_ips(self):
self.assertEqual(addr.address, get_ipv4_address(name))
# TODO: test for AF_INET6 family

def test_net_if_addrs_names(self):
names = []
with open("/proc/net/dev", "r") as f:
lines = f.readlines()
for line in lines[2:]:
colon = line.find(':')
assert colon > 0, line
names.append(line[:colon].strip())
self.assertEqual(sorted(psutil.net_if_addrs().keys()), sorted(names))

@unittest.skipUnless(which('ip'), "'ip' utility not available")
@unittest.skipIf(TRAVIS, "skipped on Travis")
def test_net_if_names(self):
Expand Down

0 comments on commit 86ffc46

Please sign in to comment.