apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

LibvirtOvsFetchInterfaceCommandWrapperTest fix (test fails in mac) - skip it if no interfaces with eth and wl (#9382)

Browse Source 
* test fix (fails in mac) - skip it if no interfaces with eth and wl

* review comments
This commit is contained in:
Suresh Kumar Anaparti 2024-07-15 00:56:23 +05:30 committed by GitHub
parent 22ef08154d
commit 877c4d9a64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapperTest.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Spy; import org.mockito.Spy;
@ -51,8 +52,7 @@ public class LibvirtOvsFetchInterfaceCommandWrapperTest {
while(interfaces.hasMoreElements()) { while(interfaces.hasMoreElements()) {
NetworkInterface networkInterface = interfaces.nextElement(); NetworkInterface networkInterface = interfaces.nextElement();
if (networkInterface.getInetAddresses().hasMoreElements() && if (networkInterface.getInetAddresses().hasMoreElements() &&
(networkInterface.getName().startsWith("eth") || networkInterface.getName().matches("^(eth|wl|en).*")) {
networkInterface.getName().startsWith("wl"))) {
interfaceName = networkInterface.getName(); interfaceName = networkInterface.getName();
Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); Enumeration<InetAddress> addresses = networkInterface.getInetAddresses();
while(addresses.hasMoreElements()) { while(addresses.hasMoreElements()) {
@ -62,9 +62,13 @@ public class LibvirtOvsFetchInterfaceCommandWrapperTest {
break; break;
}; };
} }
if (StringUtils.isNotBlank(interfaceName) && StringUtils.isNotBlank(ipAddress)) {
break;
}
} }
} }
} catch (SocketException ignored) {} } catch (SocketException ignored) {}
Assume.assumeTrue(StringUtils.isNotBlank(interfaceName));
Ternary<String, String, String> result = null; Ternary<String, String, String> result = null;
try { try {
result = wrapper.getInterfaceDetails(interfaceName); result = wrapper.getInterfaceDetails(interfaceName);