This is an automated email from the ASF dual-hosted git repository. msciabarra pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openserverless-cli.git
commit 87a5b3f5c104610bf63614b816c0381d675676fd Author: Michele Sciabarra <[email protected]> AuthorDate: Sat Jul 27 17:42:10 2024 +0200 fix tests update and plugin --- .gitmodules | 6 ++++++ tasktests/olaris | 1 + tests/plugin.bats | 2 +- tests/update.bats | 2 +- tests/update_branch.bats | 6 +++--- version.txt | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 68ca29d..80eeee5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,9 +21,15 @@ [submodule "tools/wsk"] path = _patches/wsk url = https://github.com/sciabarracom/openwhisk-cli + branch = openserverless [submodule "tools/wskdeploy"] path = _patches/wskdeploy url = https://github.com/sciabarracom/openwhisk-wskdeploy + branch = openserverless [submodule "_patches/sh"] path = _patches/sh url = https://github.com/sciabarracom/sh + branch = openserverless +[submodule "tasktests/olaris"] + path = tasktests/olaris + url = https://github.com/apache/openserverless-task diff --git a/tasktests/olaris b/tasktests/olaris new file mode 160000 index 0000000..8821aa3 --- /dev/null +++ b/tasktests/olaris @@ -0,0 +1 @@ +Subproject commit 8821aa3833801ceffa6e240a2ddf8c4523300d0c diff --git a/tests/plugin.bats b/tests/plugin.bats index 4796a83..fe5c23d 100644 --- a/tests/plugin.bats +++ b/tests/plugin.bats @@ -19,7 +19,7 @@ setup() { load 'test_helper/bats-support/load' load 'test_helper/bats-assert/load' export NO_COLOR=1 - export NUV_BRANCH="0.1.0" + export NUV_BRANCH="$(cat ../branch.txt)" } @test "nuv prints 'Plugins:'" { diff --git a/tests/update.bats b/tests/update.bats index 5301f9a..780dcaa 100644 --- a/tests/update.bats +++ b/tests/update.bats @@ -30,7 +30,7 @@ setup() { @test "nuv -update with old version warns" { NUV_VERSION=0.0.0 run nuv -update - assert_line --partial "Your nuv version (0.2.0) is older than the required version in nuvroot.json" + assert_line --partial "Your nuv version (0.0.0) is older than the required version in nuvroot.json" assert_line "Attempting to update nuv..." assert_success } diff --git a/tests/update_branch.bats b/tests/update_branch.bats index f05ad63..4cae448 100644 --- a/tests/update_branch.bats +++ b/tests/update_branch.bats @@ -19,16 +19,16 @@ setup() { load 'test_helper/bats-support/load' load 'test_helper/bats-assert/load' export NO_COLOR=1 - export NUV_BRANCH=3.0.0-testing + export NUV_BRANCH=$(cat ../branch.txt) rm -rf ~/.nuv run nuv -update - cd ~/.nuv/3.0.0-testing/olaris + cd ~/.nuv/$NUV_BRANCH/olaris } @test "nuv -update on olaris with old commit updates correctly" { run git reset --hard HEAD~1 run git status - assert_line --partial "Your branch is behind 'origin/3.0.0-testing'" + assert_line --partial "Your branch is behind" run nuv -update assert_line "Nuvfiles updated successfully" diff --git a/version.txt b/version.txt index 4611165..9bcce31 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.1.0-testing.2407261504 +0.1.0-testing.2407271736
