Skip to content

Commit 955de02

Browse files
committed
Move test_run_binary_application to 'upstream' tests
Add support for testing 'test-upstream' RHEL7 is already obsoleted. Remove conditions Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 00f5433 commit 955de02

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

.github/workflows/container-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
if: |
2121
github.event.issue.pull_request
22-
&& (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
22+
&& (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-upstream]') || contains(github.event.comment.body, '[test-all]'))
2323
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
2424
steps:
2525
- uses: sclorg/tfaga-wrapper@main

test/run

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ test_init_wrapper_false_development
3030
"
3131

3232
TEST_LIST_BINARY="\
33-
test_run_binary_application
3433
test_node_cmd_development_init_wrapper_true
3534
"
3635

test/run-upstream

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ test_client_cloudevents
2727
test_client_fastify
2828
test_client_pino
2929
test_client_langchainjs
30+
test_run_binary_application
3031
"
3132

3233
readonly EXPRESS_REVISION="${EXPRESS_REVISION:-$(docker run --rm "${IMAGE_NAME}" -- npm show express version)}"

test/test-lib-nodejs.sh

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -522,45 +522,32 @@ function test_dev_mode_true_development() {
522522
}
523523

524524
function test_node_cmd_production_init_wrapper_false() {
525-
if [ "$OS" != "rhel7" ]; then
526-
# NODE_ENV=production INIT_WRAPPER=false NODE_CMD="node server.js"
527-
test_node_cmd app production false "node server.js"
528-
fi
525+
test_node_cmd app production false "node server.js"
529526
}
530527

531528
function test_node_cmd_development_init_wrapper_true() {
532-
if [ "$OS" != "rhel7" ]; then
533-
# NODE_ENV=development INIT_WRAPPER=true NODE_CMD="node server.js"
534-
test_node_cmd app development true "node server.js"
535-
fi
529+
# NODE_ENV=development INIT_WRAPPER=true NODE_CMD="node server.js"
530+
test_node_cmd app development true "node server.js"
536531
}
537532

538533
function test_node_cmd_production_init_wrapper_true() {
539-
if [ "$OS" != "rhel7" ]; then
540-
# NODE_ENV=production INIT_WRAPPER=true NODE_CMD="node server.js"
541-
test_node_cmd app production true "node server.js"
542-
fi
534+
# NODE_ENV=production INIT_WRAPPER=true NODE_CMD="node server.js"
535+
test_node_cmd app production true "node server.js"
543536
}
544537

545538
function test_node_cmd_development_init_wrapper_false() {
546-
if [ "$OS" != "rhel7" ]; then
547-
# NODE_ENV=development INIT_WRAPPER=false NODE_CMD="node server.js"
548-
test_node_cmd app development false "node server.js"
549-
fi
539+
# NODE_ENV=development INIT_WRAPPER=false NODE_CMD="node server.js"
540+
test_node_cmd app development false "node server.js"
550541
}
551542

552543
function test_init_wrapper_true_development() {
553-
if [ "$OS" != "rhel7" ]; then
554-
# NODE_ENV=development INIT_WRAPPER=true
555-
test_node_cmd app development true
556-
fi
544+
# NODE_ENV=development INIT_WRAPPER=true
545+
test_node_cmd app development true
557546
}
558547

559548
function test_init_wrapper_false_development() {
560-
if [ "$OS" != "rhel7" ]; then
561-
# NODE_ENV=development INIT_WRAPPER=true
562-
test_node_cmd app development false
563-
fi
549+
# NODE_ENV=development INIT_WRAPPER=true
550+
test_node_cmd app development false
564551
}
565552

566553
function test_dev_mode_false_development() {

0 commit comments

Comments
 (0)