grahamc/hydra - Change OSIBECOEJH25QAXCZ76PY7OTP3STBNWEUC36WRTNYAN3IIJP5ZQQC

Attempt to fix errors during test teardown

Created by Graham Christensen on December 8, 2021

OSIBECOEJH25QAXCZ76PY7OTP3STBNWEUC36WRTNYAN3IIJP5ZQQC

Dependencies

In channels

main

upstream

Change contents

Insertion in t/View/TT.t at line 5 [6.4469]
[6.4538]
[6.4538]
```
use Test2::V0;
```
Replacement in t/View/TT.t at line 7 [6.4469]
B:BD[6.4539] → [6.4539:4562]
```
my %ctx = test_init();
```
[6.4539]
[6.4562]
```
my $ctx = test_context();
```
Deletion in t/View/TT.t at line 9 [6.4469]
B:BD[6.4563] → [6.4563:4629]
```
require Hydra::Schema;
require Hydra::Model::DB;
use Test2::V0;
```
Replacement in t/View/TT.t at line 10 [6.4469]
B:BD[6.4660] → [6.4660:4661]
[6.4660]
[6.4661]
```
require Hydra::View::TT;
require Catalyst::Test;
```
Replacement in t/View/TT.t at line 13 [6.4469]
B:BD[6.4662] → [6.4662:4712]
```
my $db = Hydra::Model::DB->new;
hydra_setup($db);
```
[6.4662]
[6.4712]
```
my $db = $ctx->db;
```
Deletion in t/View/TT.t at line 15 [6.4469]
B:BD[6.4713] → [6.4713:4738]
```
require Hydra::View::TT;
```
Deletion in t/View/TT.t at line 18 [6.4469]
B:BD[6.4838] → [6.4838:4862]
```
require Catalyst::Test;
```

Replacement in t/View/TT.t at line 23 [6.4469]

B:BD[6.5033] → [6.5033:5103]

my $jobset = createBaseJobset("example", "bogus.nix", $ctx{jobsdir});

[6.5033]

[6.5103]

my $jobset = createBaseJobset("example", "bogus.nix", $ctx->jobsdir);

Deletion in t/evaluate-basic.t at line 5 [7.1]
B:BD[7.65] → [7.65:66]
B:BD[7.66] → [8.24:47]
∅:D[8.47] → [7.106:157]
B:BD[7.106] → [7.106:157]
```
my %ctx = test_init();
require Hydra::Schema;
require Hydra::Model::DB;
```

Replacement in t/evaluate-basic.t at line 7 [7.1]

B:BD[7.173] → [7.173:223]

my $db = Hydra::Model::DB->new;
hydra_setup($db);

[7.173]

[7.223]

my $ctx = test_context();
my $db = $ctx->db;

Replacement in t/evaluate-basic.t at line 13 [7.1]

B:BD[7.368] → [2.87:155]

my $jobset = createBaseJobset("basic", "basic.nix", $ctx{jobsdir});

[7.368]

[7.421]

my $jobset = createBaseJobset("basic", "basic.nix", $ctx->jobsdir);

File addition: HydraTestContext.pm (----------)

[9.2459]

use strict;
use warnings;
package HydraTestContext;
use File::Path qw(make_path);
use File::Basename;
use Cwd qw(abs_path getcwd);
# Set up the environment for running tests.
#
# Hash Parameters:
#
#  * hydra_config: configuration for the Hydra processes for your test.
#  * nix_config: text to include in the test's nix.conf
#  * use_external_destination_store: Boolean indicating whether hydra should
#       use a destination store different from the evaluation store.
#       True by default.
#
# This clears several environment variables and sets them to ephemeral
# values: a temporary database, temporary Nix store, temporary Hydra
# data directory, etc.
#
# Note: This function must run _very_ early, before nearly any Hydra
# libraries are loaded. To use this, you very likely need to `use Setup`
# and then run `test_init`, and then `require` the Hydra libraries you
# need.
#
# It returns a tuple: a handle to a temporary directory and a handle to
# the postgres service. If either of these variables go out of scope,
# those resources are released and the test environment becomes invalid.
#
# Look at the top of an existing `.t` file to see how this should be used
# in practice.
sub new {
    my ($class, %opts) = @_;
    my $dir = File::Temp->newdir();
    $ENV{'HYDRA_DATA'} = "$dir/hydra-data";
    mkdir $ENV{'HYDRA_DATA'};
    $ENV{'NIX_CONF_DIR'} = "$dir/nix/etc/nix";
    make_path($ENV{'NIX_CONF_DIR'});
    my $nixconf = "$ENV{'NIX_CONF_DIR'}/nix.conf";
    my $nix_config = "sandbox = false\n" . ($opts{'nix_config'} || "");
    write_file($nixconf, $nix_config);
    $ENV{'HYDRA_CONFIG'} = "$dir/hydra.conf";
    my $hydra_config = $opts{'hydra_config'} || "";
    if ($opts{'use_external_destination_store'} // 1) {
        $hydra_config = "store_uri = file:$dir/nix/dest-store\n" . $hydra_config;
    }
    write_file($ENV{'HYDRA_CONFIG'}, $hydra_config);
    $ENV{'NIX_LOG_DIR'} = "$dir/nix/var/log/nix";
    $ENV{'NIX_REMOTE_SYSTEMS'} = '';
    $ENV{'NIX_REMOTE'} = '';
    $ENV{'NIX_STATE_DIR'} = "$dir/nix/var/nix";
    $ENV{'NIX_STORE_DIR'} = "$dir/nix/store";
    my $pgsql = Test::PostgreSQL->new(
        extra_initdb_args => "--locale C.UTF-8"
    );
    $ENV{'HYDRA_DBI'} = $pgsql->dsn;
    system("hydra-init") == 0 or die;
    my $self = {
        _db => undef,
        db_handle => $pgsql,
        tmpdir => $dir,
        testdir => abs_path(dirname(__FILE__) . "/.."),
        jobsdir => abs_path(dirname(__FILE__) . "/../jobs")
    };
    return bless $self, $class;
}
sub db {
    my ($self, $setup) = @_;
    if (!defined $self->{_db}) {
        require Hydra::Schema;
        require Hydra::Model::DB;
        $self->{_db} = Hydra::Model::DB->new();
        if (!(defined $setup && $setup == 0)) {
            $self->{_db}->resultset('Users')->create({
                username => "root",
                emailaddress => 'root@invalid.org',
                password => ''
            });
        }
    }
    return $self->{_db};
}
sub tmpdir {
    my ($self) = @_;
    return $self->{tmpdir};
}
sub testdir {
    my ($self) = @_;
    return $self->{testdir};
}
sub jobsdir {
    my ($self) = @_;
    return $self->{jobsdir};
}
sub DESTROY
{
    my ($self) = @_;
    $self->db(0)->schema->storage->disconnect();
}
sub write_file {
    my ($path, $text) = @_;
    open(my $fh, '>', $path) or die "Could not open file '$path' $!";
    print $fh $text || "";
    close $fh;
}
1;

Replacement in t/lib/Setup.pm at line 13 [10.518]

B:BD[10.587] → [11.485:575]

our @EXPORT = qw(test_init hydra_setup write_file nrBuildsForJobset queuedBuildsForJobset

[10.587]

[12.79]

our @EXPORT = qw(test_context test_init hydra_setup write_file nrBuildsForJobset queuedBuildsForJobset

Replacement in t/lib/Setup.pm at line 20 [10.518]

B:BD[13.46] → [13.46:65]

# Hash Parameters:

[13.46]

[13.65]

# See HydraTestContext::new for documentation
sub test_context {
    require HydraTestContext;
    return HydraTestContext->new(@_);
}
# Set up the environment for running tests.

Replacement in t/lib/Setup.pm at line 28 [10.518]

B:BD[13.67] → [13.67:139]

B:BD[13.139] → [14.0:56]

B:BD[14.56] → [4.0:171]

∅:D[14.56] → [13.139:835]

∅:D[4.171] → [13.139:835]

B:BD[13.139] → [13.139:835]

#  * hydra_config: configuration for the Hydra processes for your test.
#  * nix_config: text to include in the test's nix.conf
#  * use_external_destination_store: Boolean indicating whether hydra should
#       use a destination store different from the evaluation store.
#       True by default.
#
# This clears several environment variables and sets them to ephemeral
# values: a temporary database, temporary Nix store, temporary Hydra
# data directory, etc.
#
# Note: This function must run _very_ early, before nearly any Hydra
# libraries are loaded. To use this, you very likely need to `use Setup`
# and then run `test_init`, and then `require` the Hydra libraries you
# need.
#
# It returns a tuple: a handle to a temporary directory and a handle to
# the postgres service. If either of these variables go out of scope,
# those resources are released and the test environment becomes invalid.
#
# Look at the top of an existing `.t` file to see how this should be used
# in practice.

[13.67]

[13.835]

# See HydraTestContext::new for documentation

Replacement in t/lib/Setup.pm at line 30 [10.518]

B:BD[13.851] → [13.851:871]

∅:D[13.871] → [7.1521:1767]

B:BD[7.1521] → [7.1521:1767]

B:BD[7.1767] → [5.0:72]

∅:D[5.72] → [11.640:679]

B:BD[11.640] → [11.640:679]

∅:D[11.679] → [13.873:919]

B:BD[13.873] → [13.873:919]

    my %opts = @_;
    my $dir = File::Temp->newdir();
    $ENV{'HYDRA_DATA'} = "$dir/hydra-data";
    mkdir $ENV{'HYDRA_DATA'};
    $ENV{'NIX_CONF_DIR'} = "$dir/nix/etc/nix";
    make_path($ENV{'NIX_CONF_DIR'});
    my $nixconf = "$ENV{'NIX_CONF_DIR'}/nix.conf";
    my $nix_config = "sandbox = false\n" . ($opts{'nix_config'} || "");
    write_file($nixconf, $nix_config);
    $ENV{'HYDRA_CONFIG'} = "$dir/hydra.conf";

[13.851]

[7.1893]

    require HydraTestContext;
    my $ctx = HydraTestContext->new(@_);

Deletion in t/lib/Setup.pm at line 33 [10.518]

B:BD[7.1894] → [11.680:732]

∅:D[11.732] → [15.0:56]

B:BD[13.1026] → [15.0:56]

B:BD[15.56] → [11.733:815]

∅:D[11.815] → [15.115:121]

B:BD[15.115] → [15.115:121]

B:BD[15.121] → [11.816:870]

∅:D[11.870] → [13.1084:1085]

B:BD[13.1084] → [13.1084:1085]

B:BD[13.1085] → [16.0:50]

B:BD[16.50] → [3.0:66]

∅:D[16.50] → [7.1894:1942]

∅:D[3.66] → [7.1894:1942]

∅:D[13.1085] → [7.1894:1942]

B:BD[7.1894] → [7.1894:1942]

B:BD[7.2005] → [7.2005:2051]

B:BD[7.2101] → [7.2101:2196]

∅:D[7.2196] → [17.821:896]

B:BD[17.821] → [17.821:896]

    my $hydra_config = $opts{'hydra_config'} || "";
    if ($opts{'use_external_destination_store'} // 1) {
        $hydra_config = "store_uri = file:$dir/nix/dest-store\n" . $hydra_config;
    }
    write_file($ENV{'HYDRA_CONFIG'}, $hydra_config);
    $ENV{'NIX_LOG_DIR'} = "$dir/nix/var/log/nix";
    $ENV{'NIX_REMOTE_SYSTEMS'} = '';
    $ENV{'NIX_REMOTE'} = '';
    $ENV{'NIX_STATE_DIR'} = "$dir/nix/var/nix";
    $ENV{'NIX_STORE_DIR'} = "$dir/nix/store";
    my $pgsql = Test::PostgreSQL->new(
        extra_initdb_args => "--locale C.UTF-8"
    );
    $ENV{'HYDRA_DBI'} = $pgsql->dsn;
    system("hydra-init") == 0 or die;

Replacement in t/lib/Setup.pm at line 34 [10.518]

B:BD[8.85] → [2.1331:1353]

∅:D[2.1353] → [8.85:109]

B:BD[8.85] → [8.85:109]

B:BD[8.109] → [2.1354:1470]

∅:D[2.1470] → [8.130:137]

B:BD[8.130] → [8.130:137]

        db => $pgsql,
        tmpdir => $dir,
        testdir => abs_path(dirname(__FILE__) . "/.."),
        jobsdir => abs_path(dirname(__FILE__) . "/../jobs")
    );

[8.85]

[11.871]

        context => $ctx,
        tmpdir => $ctx->tmpdir,
        testdir => $ctx->testdir,
        jobsdir => $ctx->jobsdir
    )

Attempt to fix errors during test teardown

Dependencies

In channels

Change contents

Insertion in t/View/TT.t at line 5 [6.4469]

Replacement in t/View/TT.t at line 7 [6.4469]

Deletion in t/View/TT.t at line 9 [6.4469]

Replacement in t/View/TT.t at line 10 [6.4469]

Replacement in t/View/TT.t at line 13 [6.4469]

Deletion in t/View/TT.t at line 15 [6.4469]

Deletion in t/View/TT.t at line 18 [6.4469]