percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix/update t/pt-agent/init_agent.t.

Browse Source
This commit is contained in:
Daniel Nichter
2013-03-19 14:44:02 -06:00
parent 2291a3c6c6
commit 70c28272a7
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Percona/Test.pm
View File

@@ -150,6 +150,12 @@ sub output {
die "I need a code argument" unless $code; die "I need a code argument" unless $code;
my ($file, $stderr, $die, $trf) = @args{qw(file stderr die trf)}; my ($file, $stderr, $die, $trf) = @args{qw(file stderr die trf)};
if ( $args{debug} ) {
my $retval = eval { $code->() };
warn $EVAL_ERROR if $EVAL_ERROR;
return $retval;
}
my $output = ''; my $output = '';
{ {
if ( $file ) { if ( $file ) {

19
t/pt-agent/init_agent.t
View File

@@ -44,7 +44,7 @@ is(
# ############################################################################# # #############################################################################
my $return_agent = { my $return_agent = {
id => '123', uuid => '123',
hostname => `hostname`, hostname => `hostname`,
versions => { versions => {
'Percona::WebAPI::Client' => "$Percona::WebAPI::Client::VERSION", 'Percona::WebAPI::Client' => "$Percona::WebAPI::Client::VERSION",
@@ -114,7 +114,7 @@ ok(
$output = `cat $tmpdir/agent 2>/dev/null`; $output = `cat $tmpdir/agent 2>/dev/null`;
like( like(
$output, $output,
qr/"id":"123"/, qr/"uuid":"123"/,
"Saved new Agent" "Saved new Agent"
) or diag($output); ) or diag($output);
@@ -219,7 +219,17 @@ my $saved_agent = Percona::WebAPI::Resource::Agent->new(%$hashref);
$ua->{responses}->{put} = [ $ua->{responses}->{put} = [
{ {
code => 200, code => 200,
headers => {
Location => '/agents/123',
}, },
},
];
$ua->{responses}->{get} = [
{
code => 200,
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => $return_agent,
}
]; ];
@wait = (); @wait = ();
@@ -258,9 +268,10 @@ is(
is_deeply( is_deeply(
$ua->{requests}, $ua->{requests},
[ [
'PUT /agents', 'PUT /agents/123',
'GET /agents/123',
], ],
"PUT saved Agent" "PUT then GET saved Agent"
) or diag(Dumper($ua->{requests})); ) or diag(Dumper($ua->{requests}));
# ############################################################################# # #############################################################################