Skip to content

Commit

Permalink
fix: upgrade to tajriba 171 (#576)
Browse files Browse the repository at this point in the history
  • Loading branch information
npaton authored Aug 19, 2024
1 parent 7570af1 commit 9f492da
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changeset/upgrade-tajriba.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@empirica/core": patch
---

Upgrade Tajriba to v1.7.1 (concurrency fixes).
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ require (
github.com/charmbracelet/lipgloss v0.5.0
github.com/cortesi/moddwatch v0.0.0-20210323234936-df014e95c743
github.com/davecgh/go-spew v1.1.1
github.com/empiricaly/tajriba v1.7.0
github.com/empiricaly/tajriba v1.7.1
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-playground/validator/v10 v10.11.0
github.com/jpillora/backoff v1.0.0
github.com/json-iterator/go v1.1.12
Expand Down Expand Up @@ -47,7 +48,6 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
github.com/empiricaly/tajriba v1.7.0 h1:3WdJqOIPrdJmdWZEs7ngH20ghu27sJjqK+KKy54iY4U=
github.com/empiricaly/tajriba v1.7.0/go.mod h1:SvDTEUhhlQTQI1uBB8AWWR1cKzbE+zOfpJCm0Adkdyw=
github.com/empiricaly/tajriba v1.7.1 h1:J+69HkzwqzEvWpdahuFQyp1iL6b31Fe/WEQRKzTI/R8=
github.com/empiricaly/tajriba v1.7.1/go.mod h1:SvDTEUhhlQTQI1uBB8AWWR1cKzbE+zOfpJCm0Adkdyw=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand Down
3 changes: 3 additions & 0 deletions tests/stress/experiment/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions tests/stress/experiment/server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/stress/tests/assignment.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ test("reassignment after game end", async ({ browser }) => {

// This tests whether the player can be reassigned after the first game of the
// player ends, into a game with different players.
test.only("reassignment after game end with different players", async ({
test("reassignment after game end with different players", async ({
browser,
}) => {
const ctx = new Context(browser);
Expand Down
2 changes: 1 addition & 1 deletion tests/stress/tests/main.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ test.skip("4 x 10 player - staggered arrival", async ({ browser }) => {
// (there's a race condition between the time of assignment and fetching the
// number of players in the game). AND why overflow is not working as expected.
// First need to debug overflow.
test.skip("4 x 10 player - concurrent arrival", async ({ browser }) => {
test("4 x 10 player - concurrent arrival", async ({ browser }) => {
const ctx = new Context(browser);

ctx.logMatching(/stage started/);
Expand Down
10 changes: 10 additions & 0 deletions tools.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//go:build tools
// +build tools

// package tools is a place to list all tools used in go generate and tests, so
// that `go mod tidy` will not shoot down all those deps.
package tools

import (
_ "github.com/go-bindata/go-bindata"
)

0 comments on commit 9f492da

Please sign in to comment.