Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
8444a900
Commit
8444a900
authored
Oct 27, 2016
by
Francesc Guasch
Browse files
[#20] Add the domain URL in the content of the message.
parent
e3b0f678
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/Ravada.pm
View file @
8444a900
...
...
@@ -602,7 +602,7 @@ sub _execute {
eval
{
$sub
->
(
$self
,
$request
)
};
my
$err
=
(
$@
or
'');
$request
->
error
(
$err
);
$request
->
status
('
done
');
$request
->
status
('
done
')
if
$request
->
status
()
ne
'
done
'
;
return
$err
;
}
...
...
@@ -615,7 +615,7 @@ sub _execute {
};
my
$err
=
(
$@
or
'');
$request
->
error
(
$err
);
$request
->
status
('
done
');
$request
->
status
('
done
')
if
$request
->
status
()
ne
'
done
'
;
exit
;
}
$self
->
_add_pid
(
$pid
,
$request
->
id
);
...
...
@@ -673,8 +673,10 @@ sub _cmd_create{
my
$msg
=
'';
if
(
$domain
)
{
$msg
=
'
Domain
'
.
$request
->
args
('
name
')
.
"
created.
"
.
"
<a href=
\"
/machine/view/
"
.
$domain
->
id
.
"
.html>Start</a>
";
my
$msg
=
'
Domain
'
.
"
<a href=
\"
/machine/view/
"
.
$domain
->
id
.
"
.html
\"
>
"
.
$request
->
args
('
name
')
.
"
</a>
"
.
"
created.
"
;
}
...
...
@@ -795,8 +797,12 @@ sub _cmd_start {
my
$user
=
Ravada::Auth::
SQL
->
search_by_id
(
$uid
);
$domain
->
start
(
$user
);
$request
->
status
('
done
');
my
$msg
=
'
Domain
'
.
"
<a href=
\"
/machine/view/
"
.
$domain
->
id
.
"
.html
\"
>
"
.
$request
->
args
('
name
')
.
"
</a>
"
.
"
started
"
;
$request
->
status
('
done
',
$msg
);
}
...
...
t/request/40_base.t
View file @
8444a900
...
...
@@ -56,6 +56,18 @@ sub test_remove_domain {
}
sub
test_unread_messages
{
my
(
$user
,
$n_unread
,
$test
)
=
@_
;
confess
"
Missing test name
"
if
!
$test
;
my
@messages
=
$user
->
unread_messages
();
ok
(
scalar
@messages
==
$n_unread
,"
$test
: Expecting
$n_unread
unread messages , got
"
.
scalar
@messages
.
"
"
.
Dumper
(
\
@messages
));
$user
->
mark_all_messages_read
();
}
sub
test_req_create_domain_iso
{
my
$vm_name
=
shift
;
...
...
@@ -89,7 +101,9 @@ sub test_req_create_domain_iso {
ok
(
$req
->
status
eq
'
done
'
,"
Status of request is
"
.
$req
->
status
.
"
it should be done
");
ok
(
!
$req
->
error
,"
Error
"
.
$req
->
error
.
"
creating domain
"
.
$name
);
test_unread_messages
(
$USER
,
1
,
"
[
$vm_name
] create domain
$name
");
# test_unread_messages($USER,1, "[$vm_name] create domain $name");
test_message_new_domain
(
$vm_name
,
$USER
);
my
$req2
=
Ravada::
Request
->
open
(
$req
->
id
);
ok
(
$req2
->
{
id
}
==
$req
->
id
,"
req2->{id} =
"
.
$req2
->
{
id
}
.
"
, expecting
"
.
$req
->
id
);
...
...
@@ -104,6 +118,17 @@ sub test_req_create_domain_iso {
return
$domain
;
}
sub
test_message_new_domain
{
my
(
$vm_name
,
$user
)
=
@_
;
my
@messages
=
$user
->
unread_messages
();
ok
(
scalar
(
@messages
)
==
1
,"
Expecting 1 new message , got
"
.
Dumper
(
\
@messages
));
my
$message
=
$user
->
show_message
(
$messages
[
0
]
->
{
id
});
ok
(
$message
->
{
message
}
&&
$message
->
{
message
}
=~
/\w+/
,
"
Expecting message content not empty, got ''
")
or
exit
;
}
sub
test_req_create_domain
{
my
$name
=
new_domain_name
();
...
...
@@ -269,6 +294,9 @@ eval { $ravada = Ravada->new(connector => $test->connector) };
ok
(
$ravada
,"
I can't launch a new Ravada
");
# or exit;
remove_old_domains
();
remove_old_disks
();
for
my
$vm_name
(
qw(Void KVM)
)
{
my
$vm
;
eval
{
...
...
@@ -281,9 +309,9 @@ for my $vm_name ( qw(Void KVM)) {
skip
(
$msg
,
10
)
if
!
$vm
;
diag
("
Testing requests with
"
.
(
ref
$vm
or
'
<UNDEF>
'));
remove_old_domains
();
remove_old_disks
();
test_req_create_domain_iso
(
$vm_name
);
my
$domain_base
=
test_req_create_domain
(
$vm
)
or
next
;
test_req_prepare_base
(
$vm
,
$domain_base
->
name
);
my
$domain_clone
=
test_req_create_from_base
(
$vm
,
$domain_base
)
...
...
@@ -291,6 +319,7 @@ for my $vm_name ( qw(Void KVM)) {
test_volumes
(
$vm_name
,
$domain_base
,
$domain_clone
);
test_req_remove_base
(
$vm_name
,
$domain_base
,
$domain_clone
);
};
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment