Damn. I get that test failure very occasionally (a fraction of a percent of the times I run that test) even on trunk. Slightly more frequently on my branch than on trunk, I think. It looks like it may be a problem where get_primary_mac() makes a nondeterministic choice between MACAddress entries.
I'm including a tiny change to the test that seems to fix it. It's clear which MAC the call to get_primary_mac() was supposed to pick; I just changed the test to obtain it before the second MAC is added to the same node. It's not material to the test as such.
Damn. I get that test failure very occasionally (a fraction of a percent of the times I run that test) even on trunk. Slightly more frequently on my branch than on trunk, I think. It looks like it may be a problem where get_primary_mac() makes a nondeterministic choice between MACAddress entries.
I'm including a tiny change to the test that seems to fix it. It's clear which MAC the call to get_primary_mac() was supposed to pick; I just changed the test to obtain it before the second MAC is added to the same node. It's not material to the test as such.