Skip to content

Commit d6e7c60

Browse files
committed
wip: test fail when no ip in machine
issue #2142
1 parent 8c6640f commit d6e7c60

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

lib/Ravada/Domain.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3920,7 +3920,6 @@ sub _update_display_port_exposed($self, $name, $local_ip, $public_port, $interna
39203920
or $self->_vm->display_ip
39213921
or $local_ip );
39223922

3923-
my $is_builtin;
39243923
for (1 .. 10) {
39253924
eval {
39263925
$sth->execute($display_ip, $local_ip, $public_port,1, $self->_vm->id

t/vm/n10_nat.t

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,27 @@ sub test_nat_rdp($vm) {
7676
,id_domain => $domain->id
7777
);
7878
wait_request();
79-
wait_ip($domain);
80-
81-
$vm->nat_ip($NAT_IP);
82-
8379
my $req = Ravada::Request->start_domain(
8480
uid => user_admin->id
8581
,id_domain => $domain->id
8682
,remote_ip => $REMOTE_IP
8783
);
8884
wait_request(debug=>0);
8985

86+
wait_ip($domain);
87+
88+
die "Error: no ip found for ".$domain->name if !$domain->ip;
89+
90+
$vm->nat_ip($NAT_IP);
91+
92+
$req->status('requested');
93+
wait_request(debug=>0);
94+
9095
my $sth = connector->dbh->prepare("SELECT * FROM domain_displays");
9196
$sth->execute();
9297
while (my $row = $sth->fetchrow_hashref) {
9398
is($row->{listen_ip}, $vm->ip,"listen_ip ".$row->{driver});
94-
is($row->{ip},$NAT_IP,"ip ".$row->{driver});
99+
is($row->{ip},$NAT_IP,"ip ".$row->{driver}) or exit;
95100
}
96101
$vm->nat_ip('');
97102
}

0 commit comments

Comments
 (0)