| @@ -32,7 +32,7 @@ func TestReapStaleBuilds(t *testing.T) { |
| 32 | 32 | |
| 33 | 33 | // Claim both, then age only the first past the deadline. |
| 34 | 34 | for range 2 { |
| 35 | | if _, ok, err := s.ClaimBuild(nil); err != nil || !ok { |
| 35 | if _, ok, err := s.ClaimBuild(nil, false); err != nil || !ok { |
| 36 | 36 | t.Fatalf("claim: %v ok=%v", err, ok) |
| 37 | 37 | } |
| 38 | 38 | } |
| @@ -148,7 +148,7 @@ func TestClaimBuildScopedToRepos(t *testing.T) { |
| 148 | 148 | t.Fatal(err) |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | | b, ok, err := s.ClaimBuild([]int64{mine}) |
| 151 | b, ok, err := s.ClaimBuild([]int64{mine}, false) |
| 152 | 152 | if err != nil || !ok { |
| 153 | 153 | t.Fatalf("claim: %v ok=%v", err, ok) |
| 154 | 154 | } |
| @@ -158,11 +158,11 @@ func TestClaimBuildScopedToRepos(t *testing.T) { |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // Nothing left for that scope, even though another repo's build is pending. |
| 161 | | if _, ok, err := s.ClaimBuild([]int64{mine}); err != nil || ok { |
| 161 | if _, ok, err := s.ClaimBuild([]int64{mine}, false); err != nil || ok { |
| 162 | 162 | t.Fatalf("second scoped claim: err=%v ok=%v, want no build", err, ok) |
| 163 | 163 | } |
| 164 | 164 | // An unscoped runner still takes it. |
| 165 | | if b, ok, err := s.ClaimBuild(nil); err != nil || !ok || b.RepoID != theirs { |
| 165 | if b, ok, err := s.ClaimBuild(nil, false); err != nil || !ok || b.RepoID != theirs { |
| 166 | 166 | t.Fatalf("unscoped claim: err=%v ok=%v repo=%d", err, ok, b.RepoID) |
| 167 | 167 | } |
| 168 | 168 | } |
| @@ -232,7 +232,7 @@ func TestSuccessBuildForTree(t *testing.T) { |
| 232 | 232 | t.Fatal(err) |
| 233 | 233 | } |
| 234 | 234 | b, _ := s.BuildsForCommit(repoID, "aaa") |
| 235 | | if _, ok, err := s.ClaimBuild([]int64{repoID}); err != nil || !ok { |
| 235 | if _, ok, err := s.ClaimBuild([]int64{repoID}, false); err != nil || !ok { |
| 236 | 236 | t.Fatalf("claim: ok=%v err=%v", ok, err) |
| 237 | 237 | } |
| 238 | 238 | if err := s.FinishBuild(b["unit"].ID, "success"); err != nil { |
| @@ -262,7 +262,7 @@ func TestReapStaleBuildsAfterLogClosed(t *testing.T) { |
| 262 | 262 | if _, err := s.CreateBuild(repoID, job, "abc", "main", `["true"]`, "", "", true); err != nil { |
| 263 | 263 | t.Fatal(err) |
| 264 | 264 | } |
| 265 | | if _, ok, err := s.ClaimBuild([]int64{repoID}); err != nil || !ok { |
| 265 | if _, ok, err := s.ClaimBuild([]int64{repoID}, false); err != nil || !ok { |
| 266 | 266 | t.Fatalf("claim %s: %v", job, err) |
| 267 | 267 | } |
| 268 | 268 | } |
| @@ -315,7 +315,7 @@ func TestQueueStatsFractionalAverage(t *testing.T) { |
| 315 | 315 | if _, err := s.CreateBuild(1, "test", "abc123", "main", `["true"]`, "", "", true); err != nil { |
| 316 | 316 | t.Fatal(err) |
| 317 | 317 | } |
| 318 | | if _, ok, err := s.ClaimBuild(nil); err != nil || !ok { |
| 318 | if _, ok, err := s.ClaimBuild(nil, false); err != nil || !ok { |
| 319 | 319 | t.Fatalf("claim: %v ok=%v", err, ok) |
| 320 | 320 | } |
| 321 | 321 | } |
| @@ -331,3 +331,41 @@ func TestQueueStatsFractionalAverage(t *testing.T) { |
| 331 | 331 | t.Fatalf("stats: %+v", q) |
| 332 | 332 | } |
| 333 | 333 | } |
| 334 | |
| 335 | // A merge request head from a fork is untrusted. A claim skips it unless |
| 336 | // the runner asked for untrusted builds, so a runner on someone's laptop |
| 337 | // never executes a stranger's branch by default. |
| 338 | func TestClaimBuildSkipsUntrustedUnlessAsked(t *testing.T) { |
| 339 | s := open(t) |
| 340 | if err := s.MigrateUp(); err != nil { |
| 341 | t.Fatal(err) |
| 342 | } |
| 343 | uid, err := s.CreateUser("cmc", true) |
| 344 | if err != nil { |
| 345 | t.Fatal(err) |
| 346 | } |
| 347 | repo, err := s.CreateRepo("user", uid, "app", "public") |
| 348 | if err != nil { |
| 349 | t.Fatal(err) |
| 350 | } |
| 351 | // Queued first, so an unfiltered claim would take it. |
| 352 | forkBuild, err := s.CreateBuild(repo, "unit", "abc123", "refs/merge-requests/1/head", `["true"]`, "", "", false) |
| 353 | if err != nil { |
| 354 | t.Fatal(err) |
| 355 | } |
| 356 | own, err := s.CreateBuild(repo, "unit", "def456", "main", `["true"]`, "", "", true) |
| 357 | if err != nil { |
| 358 | t.Fatal(err) |
| 359 | } |
| 360 | b, ok, err := s.ClaimBuild(nil, false) |
| 361 | if err != nil || !ok || b.Number != own { |
| 362 | t.Fatalf("trusted-only claim: err=%v ok=%v number=%d, want %d", err, ok, b.Number, own) |
| 363 | } |
| 364 | if _, ok, _ := s.ClaimBuild(nil, false); ok { |
| 365 | t.Fatal("trusted-only claim took the fork build") |
| 366 | } |
| 367 | b, ok, err = s.ClaimBuild(nil, true) |
| 368 | if err != nil || !ok || b.Number != forkBuild { |
| 369 | t.Fatalf("untrusted claim: err=%v ok=%v number=%d, want %d", err, ok, b.Number, forkBuild) |
| 370 | } |
| 371 | } |