Skip to content

Commit 07aea0e

Browse files
committed
Fix grep regex
1 parent e076a95 commit 07aea0e

9 files changed

Lines changed: 19 additions & 22 deletions

File tree

test/fuelup/beta-1.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
source dev-container-features-test-lib
55

66
# Feature-specific tests
7-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
8-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
7+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
8+
check "execute command" forc --version | grep 'forc [0-9].'
99
check "execute command" fuelup default | grep 'beta-1'
1010

1111
reportResults

test/fuelup/beta-2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
source dev-container-features-test-lib
55

66
# Feature-specific tests
7-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
8-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
7+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
8+
check "execute command" forc --version | grep 'forc [0-9].'
99
check "execute command" fuelup default | grep 'beta-2'
1010

1111
reportResults

test/fuelup/beta-3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
source dev-container-features-test-lib
55

66
# Feature-specific tests
7-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
8-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
7+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
8+
check "execute command" forc --version | grep 'forc [0-9].'
99
check "execute command" fuelup default | grep 'beta-3'
1010

1111
reportResults

test/fuelup/default.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ set -e
1818
source dev-container-features-test-lib
1919

2020
# Feature-specific tests
21-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
22-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
21+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
22+
check "execute command" forc --version | grep 'forc [0-9].'
2323
check "execute command" fuelup default | grep 'latest'
2424

2525
# If any of the checks above exited with a non-zero exit code, the test will fail.

test/fuelup/latest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
source dev-container-features-test-lib
55

66
# Feature-specific tests
7-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
8-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
7+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
8+
check "execute command" forc --version | grep 'forc [0-9].'
99
check "execute command" fuelup default | grep 'latest'
1010

1111
reportResults

test/fuelup/nightly.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
source dev-container-features-test-lib
55

66
# Feature-specific tests
7-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
8-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
7+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
8+
check "execute command" forc --version | grep 'forc [0-9].'
99
check "execute command" fuelup default | grep 'nightly'
1010

1111
reportResults

test/fuelup/root.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ source dev-container-features-test-lib
55

66
# Feature-specific tests
77
check "execute command" whoami | grep 'root'
8-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
9-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
8+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
9+
check "execute command" forc --version | grep 'forc [0-9].'
1010
check "execute command" fuelup default | grep 'latest'
1111

1212
reportResults

test/fuelup/test.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,16 @@
1818
# --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
1919
# /path/to/this/repo
2020

21-
set -x
21+
set -e
2222

2323
# Optional: Import test library bundled with the devcontainer CLI
2424
# Provides the 'check' and 'reportResults' commands.
2525
source dev-container-features-test-lib
2626

27-
echo $PATH
28-
ls ~/.fuelup/bin
29-
3027
# Feature-specific tests
3128
# The 'check' command comes from the dev-container-features-test-lib.
32-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
33-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
29+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
30+
check "execute command" forc --version | grep 'forc [0-9].'
3431
check "execute command" fuelup default | grep 'latest'
3532

3633
# Report result

test/fuelup/vscode.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ source dev-container-features-test-lib
55

66
# Feature-specific tests
77
check "execute command" whoami | grep 'vscode'
8-
check "execute command" fuelup --version | grep -E 'fuelup (\d+\.)+\d+'
9-
check "execute command" forc --version | grep -E 'forc (\d+\.)+\d+'
8+
check "execute command" fuelup --version | grep 'fuelup [0-9].'
9+
check "execute command" forc --version | grep 'forc [0-9].'
1010
check "execute command" fuelup default | grep 'latest'
1111

1212
reportResults

0 commit comments

Comments
 (0)