Skip to content

Commit

Permalink
fix(turbo): update regex in integration tests (#2851)
Browse files Browse the repository at this point in the history
  • Loading branch information
tknickman committed Nov 28, 2022
1 parent cadc222 commit d79896c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ e2e: corepack install turbo
node -r esbuild-register scripts/e2e/e2e.ts

cmd/turbo/version.go: ../version.txt
# Update this atomically to avoid issues with this being overwritten during use
# Update this automatically to avoid issues with this being overwritten during use
node -e 'console.log(`package main\n\nconst turboVersion = "$(TURBO_VERSION)"`)' > cmd/turbo/version.go.txt
mv cmd/turbo/version.go.txt cmd/turbo/version.go

Expand Down
18 changes: 9 additions & 9 deletions cli/integration_tests/monorepo_one_script_error/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Note that npm reports any failed script as exit code 1, even though we "exit 2"
my-app:error: npm ERR! Lifecycle script `error` failed with error:
my-app:error: npm ERR! Error: command failed
my-app:error: npm ERR! in workspace: my-app
my-app:error: npm ERR! at location: .*/run.t/apps/my-app (re)
my-app:error: ERROR: command finished with error: command \(.*/run\.t/apps/my-app\) npm run error exited \(1\) (re)
command \(.*/run.t/apps/my-app\) npm run error exited \(1\) (re)
my-app:error: npm ERR! at location: .*/run\.t(-\d+)?/apps/my-app (re)
my-app:error: ERROR: command finished with error: command \(.*/run\.t(-\d+)?/apps/my-app\) npm run error exited \(1\) (re)
command \(.*/run\.t(-\d+)?/apps/my-app\) npm run error exited \(1\) (re)

Tasks: 1 successful, 2 total
Cached: 0 cached, 2 total
Expand Down Expand Up @@ -54,9 +54,9 @@ Make sure error isn't cached
my-app:error: npm ERR! Lifecycle script `error` failed with error:
my-app:error: npm ERR! Error: command failed
my-app:error: npm ERR! in workspace: my-app
my-app:error: npm ERR! at location: .*/run.t/apps/my-app (re)
my-app:error: ERROR: command finished with error: command \(.*/run\.t/apps/my-app\) npm run error exited \(1\) (re)
command \(.*/run.t/apps/my-app\) npm run error exited \(1\) (re)
my-app:error: npm ERR! at location: .*/run\.t(-\d+)?/apps/my-app (re)
my-app:error: ERROR: command finished with error: command \(.*/run\.t(-\d+)?/apps/my-app\) npm run error exited \(1\) (re)
command \(.*/run\.t(-\d+)?/apps/my-app\) npm run error exited \(1\) (re)
Tasks: 1 successful, 2 total
Cached: 1 cached, 2 total
Expand All @@ -70,7 +70,7 @@ Running with --output-mode=errors-only gives error output only
\xe2\x80\xa2 Packages in scope: my-app (esc)
\xe2\x80\xa2 Running error in 1 packages (esc)
\xe2\x80\xa2 Remote caching disabled (esc)
my-app:error: ERROR: command finished with error: command \(.*/run\.t/apps/my-app\) npm run error exited \(1\) (re)
my-app:error: ERROR: command finished with error: command \(.*/run\.t(-\d+)?/apps/my-app\) npm run error exited \(1\) (re)
my-app:error:
my-app:error: > error
my-app:error: > echo 'intentionally failing' && exit 2
Expand All @@ -79,8 +79,8 @@ Running with --output-mode=errors-only gives error output only
my-app:error: npm ERR! Lifecycle script `error` failed with error:
my-app:error: npm ERR! Error: command failed
my-app:error: npm ERR! in workspace: my-app
my-app:error: npm ERR! at location: .*/run.t/apps/my-app (re)
command \(.*/run.t/apps/my-app\) npm run error exited \(1\) (re)
my-app:error: npm ERR! at location: .*/run\.t(-\d+)?/apps/my-app (re)
command \(.*/run\.t(-\d+)?/apps/my-app\) npm run error exited \(1\) (re)
Tasks: 1 successful, 2 total
Cached: 1 cached, 2 total
Expand Down

0 comments on commit d79896c

Please sign in to comment.