oppi.li / indigo
fork of indigo with slightly nicer lexgen
fork atom

fixing up a few more tests

whyrusleeping f9f6e8c1 2a077980

options
unified split
Changed files
+53 -30
repomgr
ingest_test.go
testing
integ_test.go
utils.go
+12 -11
repomgr/ingest_test.go
··· 69 69 } 70 70 } 71 71 72 - func testCarstore(t *testing.T, dir string) carstore.CarStore { 72 + func testCarstore(t *testing.T, dir string, archive bool) carstore.CarStore { 73 73 cardb, err := gorm.Open(sqlite.Open(filepath.Join(dir, "car.sqlite"))) 74 74 if err != nil { 75 75 t.Fatal(err) ··· 80 80 t.Fatal(err) 81 81 } 82 82 83 - /* 83 + if archive { 84 84 cs, err := carstore.NewCarStore(cardb, []string{cspath}) 85 85 if err != nil { 86 86 t.Fatal(err) 87 87 } 88 - */ 88 + return cs 89 + } else { 90 + cs, err := carstore.NewNonArchivalCarstore(cardb) 91 + if err != nil { 92 + t.Fatal(err) 93 + } 89 94 90 - cs, err := carstore.NewNonArchivalCarstore(cardb) 91 - if err != nil { 92 - t.Fatal(err) 95 + return cs 93 96 } 94 - 95 - return cs 96 97 } 97 98 98 99 func TestIngestWithGap(t *testing.T) { ··· 113 114 Uid: 1, 114 115 }) 115 116 116 - cs := testCarstore(t, dir) 117 + cs := testCarstore(t, dir, true) 117 118 118 119 repoman := NewRepoManager(cs, &util.FakeKeyManager{}) 119 120 ··· 121 122 if err != nil { 122 123 t.Fatal(err) 123 124 } 124 - cs2 := testCarstore(t, dir2) 125 + cs2 := testCarstore(t, dir2, true) 125 126 126 127 var since *string 127 128 ctx := context.TODO() ··· 205 206 Uid: 1, 206 207 }) 207 208 208 - cs := testCarstore(t, dir) 209 + cs := testCarstore(t, dir, true) 209 210 210 211 repoman := NewRepoManager(cs, &util.FakeKeyManager{}) 211 212
+28 -8
testing/integ_test.go
··· 20 20 ) 21 21 22 22 func TestRelayBasic(t *testing.T) { 23 + t.Helper() 24 + testRelayBasic(t, true) 25 + } 26 + 27 + func TestRelayBasicNonArchive(t *testing.T) { 28 + t.Helper() 29 + testRelayBasic(t, false) 30 + } 31 + 32 + func testRelayBasic(t *testing.T, archive bool) { 23 33 if testing.Short() { 24 34 t.Skip("skipping Relay test in 'short' test mode") 25 35 } ··· 28 38 p1 := MustSetupPDS(t, ".tpds", didr) 29 39 p1.Run(t) 30 40 31 - b1 := MustSetupRelay(t, didr) 41 + b1 := MustSetupRelay(t, didr, archive) 32 42 b1.Run(t) 33 43 34 44 b1.tr.TrialHosts = []string{p1.RawHost()} ··· 111 121 } 112 122 113 123 func TestRelayMultiPDS(t *testing.T) { 124 + t.Helper() 125 + testRelayMultiPDS(t, true) 126 + } 127 + 128 + func TestRelayMultiPDSNonArchive(t *testing.T) { 129 + t.Helper() 130 + testRelayMultiPDS(t, false) 131 + } 132 + 133 + func testRelayMultiPDS(t *testing.T, archive bool) { 114 134 if testing.Short() { 115 135 t.Skip("skipping Relay test in 'short' test mode") 116 136 } ··· 125 145 p2 := MustSetupPDS(t, ".pdsdos", didr) 126 146 p2.Run(t) 127 147 128 - b1 := MustSetupRelay(t, didr) 148 + b1 := MustSetupRelay(t, didr, archive) 129 149 b1.Run(t) 130 150 131 151 b1.tr.TrialHosts = []string{p1.RawHost(), p2.RawHost()} ··· 193 213 p2 := MustSetupPDS(t, ".pdsdos", didr) 194 214 p2.Run(t) 195 215 196 - b1 := MustSetupRelay(t, didr) 216 + b1 := MustSetupRelay(t, didr, true) 197 217 b1.Run(t) 198 218 199 219 b1.tr.TrialHosts = []string{p1.RawHost(), p2.RawHost()} ··· 251 271 p1 := MustSetupPDS(t, ".pdsuno", didr) 252 272 p1.Run(t) 253 273 254 - b1 := MustSetupRelay(t, didr) 274 + b1 := MustSetupRelay(t, didr, true) 255 275 b1.Run(t) 256 276 257 277 b1.tr.TrialHosts = []string{p1.RawHost()} ··· 288 308 p1 := MustSetupPDS(t, ".pdsuno", didr) 289 309 p1.Run(t) 290 310 291 - b1 := MustSetupRelay(t, didr) 311 + b1 := MustSetupRelay(t, didr, true) 292 312 b1.Run(t) 293 313 294 314 b1.tr.TrialHosts = []string{p1.RawHost()} ··· 396 416 p1 := MustSetupPDS(t, ".tpds", didr) 397 417 p1.Run(t) 398 418 399 - b1 := MustSetupRelay(t, didr) 419 + b1 := MustSetupRelay(t, didr, true) 400 420 b1.Run(t) 401 421 402 422 b1.tr.TrialHosts = []string{p1.RawHost()} ··· 475 495 } 476 496 didr := TestPLC(t) 477 497 478 - b1 := MustSetupRelay(t, didr) 498 + b1 := MustSetupRelay(t, didr, true) 479 499 b1.Run(t) 480 500 481 501 b1.BanDomain(t, "foo.com") ··· 518 538 p1 := MustSetupPDS(t, ".tpds", didr) 519 539 p1.Run(t) 520 540 521 - b1 := MustSetupRelay(t, didr) 541 + b1 := MustSetupRelay(t, didr, true) 522 542 b1.Run(t) 523 543 524 544 b1.tr.TrialHosts = []string{p1.RawHost()}
+13 -11
testing/utils.go
··· 518 518 return t.listener.Addr().String() 519 519 } 520 520 521 - func MustSetupRelay(t *testing.T, didr plc.PLCClient) *TestRelay { 521 + func MustSetupRelay(t *testing.T, didr plc.PLCClient, archive bool) *TestRelay { 522 522 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) 523 523 defer cancel() 524 - tbgs, err := SetupRelay(ctx, didr) 524 + tbgs, err := SetupRelay(ctx, didr, archive) 525 525 if err != nil { 526 526 t.Fatal(err) 527 527 } ··· 529 529 return tbgs 530 530 } 531 531 532 - func SetupRelay(ctx context.Context, didr plc.PLCClient) (*TestRelay, error) { 532 + func SetupRelay(ctx context.Context, didr plc.PLCClient, archive bool) (*TestRelay, error) { 533 533 dir, err := os.MkdirTemp("", "integtest") 534 534 if err != nil { 535 535 return nil, err ··· 550 550 return nil, err 551 551 } 552 552 553 - /* 554 - cs, err := carstore.NewCarStore(cardb, []string{cspath}) 553 + var cs carstore.CarStore 554 + if archive { 555 + arccs, err := carstore.NewCarStore(cardb, []string{cspath}) 555 556 if err != nil { 556 557 return nil, err 557 558 } 558 - //*/ 559 - //* 560 - cs, err := carstore.NewNonArchivalCarstore(cardb) 561 - if err != nil { 562 - return nil, err 559 + cs = arccs 560 + } else { 561 + nacs, err := carstore.NewNonArchivalCarstore(cardb) 562 + if err != nil { 563 + return nil, err 564 + } 565 + cs = nacs 563 566 } 564 - //*/ 565 567 566 568 //kmgr := indexer.NewKeyManager(didr, nil) 567 569 kmgr := &bsutil.FakeKeyManager{}