evaluate-dependent-jobsets: clean up test to be more clear

[?]
Feb 23, 2021, 7:16 PM
HENEI752UEEVFHNT5CWNJJCEQFAL436CQ3KKGIJ624L4BL4G5WLAC

Dependencies

  • [2] 6TCJBZ4K Use is in evaluate-dependent-jobsets
  • [3] 3G475GRT Split out dependent tests in to its own .t

Change contents

  • replacement in tests/evaluate-dependent-jobsets.t at line 18
    [3.393][3.393:513](),[3.513][2.0:136](),[2.136][3.651:700](),[3.651][3.651:700](),[3.700][2.137:250]()
    ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix should exit with return code 0");
    is(nrQueuedBuildsForJobset($jobset), 1 , "Evaluating jobs/build-output-as-input.nix for first time should result in 1 build in queue");
    for my $build (queuedBuildsForJobset($jobset)) {
    ok(runBuild($build), "Build '".$build->job."' from jobs/build-output-as-input.nix should exit with code 0");
    [3.393]
    [3.797]
    ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix should exit with return code 0");
    is(nrQueuedBuildsForJobset($jobset), 1 , "Evaluation should result in 1 build in queue");
    subtest "For the 'build1' job" => sub {
    my ($build) = queuedBuildsForJobset($jobset);
    is($build->job, "build1", "Verify the only job we got is for 'build1'");
    ok(runBuild($build), "Build should exit with code 0");
  • replacement in tests/evaluate-dependent-jobsets.t at line 27
    [3.860][2.251:491](),[2.491][3.998:1000](),[3.998][3.998:1000]()
    is($newbuild->finished, 1, "Build '".$build->job."' from jobs/build-output-as-input.nix should be finished.");
    is($newbuild->buildstatus, 0, "Build '".$build->job."' from jobs/build-output-as-input.nix should have buildstatus 0.");
    }
    [3.860]
    [3.1000]
    is($newbuild->finished, 1, "Build should be finished.");
    is($newbuild->buildstatus, 0, "Build should have buildstatus 0.");
    };
    ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix for second time should exit with return code 0");
    is(nrQueuedBuildsForJobset($jobset), 1 , "The second evaluation should result in 1 new build in queue: build2");
    subtest "For the 'build2' job" => sub {
    my ($build) = queuedBuildsForJobset($jobset);
    is($build->job, "build2", "Verify the only job we got is for 'build2'");
  • replacement in tests/evaluate-dependent-jobsets.t at line 37
    [3.1001][3.1001:1137](),[3.1137][2.492:651](),[2.651][3.1298:1444](),[3.1298][3.1298:1444]()
    ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix for second time should exit with return code 0");
    is(nrQueuedBuildsForJobset($jobset), 1 , "Evaluating jobs/build-output-as-input.nix for second time after building build1 should result in 1 build in queue");
    for my $build (queuedBuildsForJobset($jobset)) {
    ok(runBuild($build), "Build '".$build->job."' from jobs/basic.nix should exit with code 0");
    [3.1001]
    [3.1444]
    ok(runBuild($build), "Build should exit with code 0");
  • replacement in tests/evaluate-dependent-jobsets.t at line 39
    [3.1507][2.652:892](),[2.892][3.1645:1647](),[3.1645][3.1645:1647]()
    is($newbuild->finished, 1, "Build '".$build->job."' from jobs/build-output-as-input.nix should be finished.");
    is($newbuild->buildstatus, 0, "Build '".$build->job."' from jobs/build-output-as-input.nix should have buildstatus 0.");
    }
    [3.1507]
    [3.1647]
    is($newbuild->finished, 1, "Build should be finished.");
    is($newbuild->buildstatus, 0, "Build should have buildstatus 0.");
    };