Skip to content

Commit

Permalink
Remove .bash suffix from bats includes to enable compatibility with o…
Browse files Browse the repository at this point in the history
…lder versions (gravitational#6053)
  • Loading branch information
webvictim authored Mar 19, 2021
1 parent 69e40c9 commit 029acc9
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions assets/aws/files/tests/fixtures/common.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export TELEPORT_TESTVAR_PUBLIC_IP=1.2.3.4
TEST_SUITE="$(basename ${BATS_TEST_FILENAME%%.bats})"

setup_file() {
load fixtures/test-setup.bash
load fixtures/test-setup

# write_confd_file is a function defined to set up fixtures inside each test
write_confd_file
Expand All @@ -24,5 +24,5 @@ setup_file() {
}

teardown_file() {
load fixtures/test-teardown.bash
load fixtures/test-teardown
}
2 changes: 1 addition & 1 deletion assets/aws/files/tests/ha-auth-fips.bats
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ EOF
export TELEPORT_TEST_FIPS_MODE=true
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/ha-auth-oss.bats
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ USE_ACM=false
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/ha-auth.bats
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ USE_ACM=false
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/ha-node.bats
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ USE_ACM=false
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/ha-proxy-acm.bats
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ USE_ACM=true
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/ha-proxy.bats
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export USE_ACM=false
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/starter-cluster-acm-fips.bats
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EOF
export TELEPORT_TEST_FIPS_MODE=true
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/starter-cluster-acm.bats
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ USE_ACM=true
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/starter-cluster-fips.bats
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EOF
export TELEPORT_TEST_FIPS_MODE=true
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion assets/aws/files/tests/starter-cluster.bats
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ USE_ACM=false
EOF
}

load fixtures/common.bash
load fixtures/common

@test "[${TEST_SUITE?}] config file was generated without error" {
[ ${GENERATE_EXIT_CODE?} -eq 0 ]
Expand Down

0 comments on commit 029acc9

Please sign in to comment.