grahamc/hydra - Change QIW2WZKWE3ULO4O4QB6EQWUKZY2UFNN7WA464FMIZOAHP3UHFGSAC

Fix indentation

Created by Eelco Dolstra on January 23, 2013

QIW2WZKWE3ULO4O4QB6EQWUKZY2UFNN7WA464FMIZOAHP3UHFGSAC

Dependencies

In channels

upstream

main

Change contents

Replacement in tests/Setup.pm at line 14 [6.518]

B:BD[6.637] → [6.637:763]

  my ($db) = @_;
  $db->resultset('Users')->create({ username => "root", emailaddress => 'root@email.com', password => '' });

[6.637]

[7.0]

    my ($db) = @_;
    $db->resultset('Users')->create({ username => "root", emailaddress => 'root@email.com', password => '' });

Replacement in tests/Setup.pm at line 19 [6.518]

B:BD[7.27] → [7.27:97]

  my ($jobset) = @_;
  return $jobset->builds->search({},{})->count ;

[7.27]

[8.408]

    my ($jobset) = @_;
    return $jobset->builds->search({},{})->count ;

Replacement in tests/Setup.pm at line 24 [6.518]

B:BD[8.439] → [8.439:460]

B:BD[8.460] → [3.0:51]

  my ($jobset) = @_;
  return $jobset->builds->search({finished => 0});

[8.439]

[7.97]

    my ($jobset) = @_;
    return $jobset->builds->search({finished => 0});

Replacement in tests/Setup.pm at line 29 [6.518]

B:BD[7.130] → [7.130:151]

B:BD[7.151] → [8.528:577]

  my ($jobset) = @_;
  return queuedBuildsForJobset($jobset)->count ;

[7.130]

[7.226]

    my ($jobset) = @_;
    return queuedBuildsForJobset($jobset)->count ;

Replacement in tests/Setup.pm at line 34 [6.518]
B:BD[7.252] → [7.252:291]
```
  my ($jobsetName, $nixexprpath) = @_;
```
[7.252]
[5.37772]
```
    my ($jobsetName, $nixexprpath) = @_;
```

Replacement in tests/Setup.pm at line 36 [6.518]

∅:D[5.37773] → [9.23:174]

B:BD[8.581] → [9.23:174]

∅:D[9.174] → [7.408:547]

∅:D[8.706] → [7.408:547]

B:BD[7.408] → [7.408:547]

  my $db = Hydra::Model::DB->new;
  my $project = $db->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
  my $jobset = $project->jobsets->create({name => $jobsetName, nixexprinput => "jobs", nixexprpath => $nixexprpath, emailoverride => ""});

[5.37773]

[7.547]

    my $db = Hydra::Model::DB->new;
    my $project = $db->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
    my $jobset = $project->jobsets->create({name => $jobsetName, nixexprinput => "jobs", nixexprpath => $nixexprpath, emailoverride => ""});

Replacement in tests/Setup.pm at line 40 [6.518]

B:BD[7.548] → [7.548:589]

  my $jobsetinput;
  my $jobsetinputals;

[7.548]

[7.589]

    my $jobsetinput;
    my $jobsetinputals;

Replacement in tests/Setup.pm at line 43 [6.518]

B:BD[7.590] → [7.590:770]

  $jobsetinput = $jobset->jobsetinputs->create({name => "jobs", type => "path"});
  $jobsetinputals = $jobsetinput->jobsetinputalts->create({altnr => 0, value => getcwd."/jobs"});

[7.590]

[7.770]

    $jobsetinput = $jobset->jobsetinputs->create({name => "jobs", type => "path"});
    $jobsetinputals = $jobsetinput->jobsetinputalts->create({altnr => 0, value => getcwd."/jobs"});

Replacement in tests/Setup.pm at line 46 [6.518]
B:BD[7.771] → [7.771:789]
```
  return $jobset;
```
[7.771]
[7.789]
```
    return $jobset;
```

Replacement in tests/Setup.pm at line 50 [6.518]

B:BD[7.823] → [7.823:942]

  my ($jobsetName, $nixexprpath, $name, $type, $uri) = @_;
  my $jobset = createBaseJobset($jobsetName, $nixexprpath);

[7.823]

[7.942]

    my ($jobsetName, $nixexprpath, $name, $type, $uri) = @_;
    my $jobset = createBaseJobset($jobsetName, $nixexprpath);

Replacement in tests/Setup.pm at line 53 [6.518]

B:BD[7.943] → [7.943:984]

  my $jobsetinput;
  my $jobsetinputals;

[7.943]

[7.984]

    my $jobsetinput;
    my $jobsetinputals;

Replacement in tests/Setup.pm at line 56 [6.518]

B:BD[7.985] → [7.985:1065]

B:BD[7.1065] → [2.0:88]

  $jobsetinput = $jobset->jobsetinputs->create({name => $name, type => $type});
  $jobsetinputals = $jobsetinput->jobsetinputalts->create({altnr => 0, value => $uri});

[7.985]

[7.1153]

    $jobsetinput = $jobset->jobsetinputs->create({name => $name, type => $type});
    $jobsetinputals = $jobsetinput->jobsetinputalts->create({altnr => 0, value => $uri});

Replacement in tests/Setup.pm at line 59 [6.518]
B:BD[7.1154] → [7.1154:1172]
```
  return $jobset;
```
[7.1154]
[6.763]
```
    return $jobset;
```

Replacement in tests/Setup.pm at line 63 [6.518]

B:BD[7.1192] → [7.1192:1213]

B:BD[7.1213] → [10.130:293]

∅:D[11.113] → [7.1327:1467]

∅:D[10.293] → [7.1327:1467]

∅:D[12.362] → [7.1327:1467]

B:BD[7.1327] → [7.1327:1467]

B:BD[7.1467] → [10.294:400]

∅:D[10.400] → [7.1467:1482]

B:BD[7.1467] → [7.1467:1482]

  my ($jobset) = @_;
  my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("../src/script/hydra-evaluator", $jobset->project->name, $jobset->name));
  chomp $stdout; chomp $stderr;
  print STDERR "Evaluation errors for jobset ".$jobset->project->name.":".$jobset->name.": \n".$jobset->errormsg."\n" if $jobset->errormsg;
  print STDERR "STDOUT: $stdout\n" if $stdout ne "";
  print STDERR "STDERR: $stderr\n" if $stderr ne "";
  return $res;

[7.1192]

[7.1482]

    my ($jobset) = @_;
    my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("../src/script/hydra-evaluator", $jobset->project->name, $jobset->name));
    chomp $stdout; chomp $stderr;
    print STDERR "Evaluation errors for jobset ".$jobset->project->name.":".$jobset->name.": \n".$jobset->errormsg."\n" if $jobset->errormsg;
    print STDERR "STDOUT: $stdout\n" if $stdout ne "";
    print STDERR "STDERR: $stderr\n" if $stderr ne "";
    return $res;

Replacement in tests/Setup.pm at line 73 [6.518]

B:BD[8.722] → [8.722:742]

B:BD[8.742] → [4.101:271]

  my ($build) = @_;
  my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("../src/script/hydra-build", $build->id));
  print "STDERR: $stderr" if $res;
  return ($res, $stdout, $stderr);

[8.722]

[13.4328]

    my ($build) = @_;
    my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("../src/script/hydra-build", $build->id));
    print "STDERR: $stderr" if $res;
    return ($res, $stdout, $stderr);

Replacement in tests/Setup.pm at line 80 [6.518]

B:BD[13.4354] → [14.14:115]

∅:D[14.115] → [13.4463:4529]

B:BD[13.4463] → [13.4463:4529]

B:BD[13.4529] → [14.116:297]

  my ($scm, $update) = @_;
  my ($res, $stdout, $stderr) = captureStdoutStderr(60, ($update, $scm));
  die "Unexpected update error with $scm: $stderr\n" unless $res;
  my ($message, $loop, $status) = $stdout =~ m/::(.*) -- (.*) -- (.*)::/;
  print STDOUT "Update $scm repository: $message\n";
  return ($loop eq "continue", $status eq "updated");

[13.4354]

[8.822]

    my ($scm, $update) = @_;
    my ($res, $stdout, $stderr) = captureStdoutStderr(60, ($update, $scm));
    die "Unexpected update error with $scm: $stderr\n" unless $res;
    my ($message, $loop, $status) = $stdout =~ m/::(.*) -- (.*) -- (.*)::/;
    print STDOUT "Update $scm repository: $message\n";
    return ($loop eq "continue", $status eq "updated");