Merge pull request #1097 from DeterminateSystems/api-test-warnings
Api test warnings: clean up
This commit is contained in:
commit
98c88a4dbf
|
@ -239,7 +239,7 @@ sub updateJobset {
|
||||||
error($c, "Cannot rename jobset to ‘$jobsetName’ since that identifier is already taken.")
|
error($c, "Cannot rename jobset to ‘$jobsetName’ since that identifier is already taken.")
|
||||||
if $jobsetName ne $oldName && defined $c->stash->{project}->jobsets->find({ name => $jobsetName });
|
if $jobsetName ne $oldName && defined $c->stash->{project}->jobsets->find({ name => $jobsetName });
|
||||||
|
|
||||||
my $type = int($c->stash->{params}->{"type"}) // 0;
|
my $type = int($c->stash->{params}->{"type"} // 0);
|
||||||
|
|
||||||
my ($nixExprPath, $nixExprInput);
|
my ($nixExprPath, $nixExprInput);
|
||||||
my $flake;
|
my $flake;
|
||||||
|
@ -270,7 +270,7 @@ sub updateJobset {
|
||||||
, enableemail => defined $c->stash->{params}->{enableemail} ? 1 : 0
|
, enableemail => defined $c->stash->{params}->{enableemail} ? 1 : 0
|
||||||
, emailoverride => trim($c->stash->{params}->{emailoverride}) || ""
|
, emailoverride => trim($c->stash->{params}->{emailoverride}) || ""
|
||||||
, hidden => defined $c->stash->{params}->{visible} ? 0 : 1
|
, hidden => defined $c->stash->{params}->{visible} ? 0 : 1
|
||||||
, keepnr => int(trim($c->stash->{params}->{keepnr}))
|
, keepnr => int(trim($c->stash->{params}->{keepnr} // "0"))
|
||||||
, checkinterval => $checkinterval
|
, checkinterval => $checkinterval
|
||||||
, triggertime => ($enabled && $checkinterval > 0) ? $jobset->triggertime // time() : undef
|
, triggertime => ($enabled && $checkinterval > 0) ? $jobset->triggertime // time() : undef
|
||||||
, schedulingshares => $shares
|
, schedulingshares => $shares
|
||||||
|
|
|
@ -42,12 +42,11 @@ sub request_json {
|
||||||
$req->uri("http://localhost$opts->{uri}");
|
$req->uri("http://localhost$opts->{uri}");
|
||||||
$req->header(Accept => "application/json");
|
$req->header(Accept => "application/json");
|
||||||
$req->header(Content_Type => "application/json");
|
$req->header(Content_Type => "application/json");
|
||||||
$req->header(Origin => "http://localhost/") if $opts->{method} eq "POST";
|
$req->header(Origin => "http://localhost/") if ($opts->{method} // "") eq "POST";
|
||||||
$req->header(Cookie => $cookie);
|
$req->header(Cookie => $cookie);
|
||||||
|
|
||||||
$req->content(encode_json($opts->{data})) if defined $opts->{data};
|
$req->content(encode_json($opts->{data})) if defined $opts->{data};
|
||||||
my $res = request($req);
|
my $res = request($req);
|
||||||
print $res->as_string();
|
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue