Commit 0da0eb79 authored by frankiejol's avatar frankiejol
Browse files

fixed missed conflict on merge

parent 1f91c259
......@@ -927,12 +927,8 @@ sub test_clone_exports_add_ports($vm) {
}
sub _wait_ip2($vm_name, $domain) {
<<<<<<< HEAD
for ( 1 .. 30 ) {
=======
$domain->start(user => user_admin, remote_ip => '1.2.3.5') unless $domain->is_active();
for ( 1 .. 22 ) {
>>>>>>> bfcb8f0a... feat(frontend): show network interfaces hw address (#1539)
for ( 1 .. 30 ) {
return $domain->ip if $domain->ip;
diag("Waiting for ".$domain->name. " ip") if !(time % 10);
sleep 1;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment