Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

t3c integration tests to not modify config file #7028

Merged
rob05c merged 2 commits into from
Aug 19, 2022
Merged

t3c integration tests to not modify config file #7028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
092de2c
write tc-fixtures.json to tmp file and move to container
jpappa200 Aug 18, 2022
09c42ed
use tc-fixtures.json from container
jpappa200 Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions cache-config/testing/docker/ort_test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ else
echo "$(</ort-tests/tc-fixtures.json jq --arg ATS_RPM "$ATS_RPM" '.profiles[] |= (
select(.params != null).params[] |= (
select(.configFile == "package" and .name == "trafficserver").value = $ATS_RPM
))')" >/ort-tests/tc-fixtures.json
if ! </ort-tests/tc-fixtures.json jq -r --arg ATS_RPM "$ATS_RPM" '.profiles[] |
))')" >/ort-tests/tc-fixtures.json.tmp
if ! </ort-tests/tc-fixtures.json.tmp jq -r --arg ATS_RPM "$ATS_RPM" '.profiles[] |
select(.params != null).params[] |
select(.configFile == "package" and .name == "trafficserver")
.value' |
Expand Down Expand Up @@ -106,7 +106,7 @@ while ! nc $TO_HOSTNAME $TO_PORT </dev/null; do
fi
done

cp /ort-tests/tc-fixtures.json /tc-fixtures.json
mv /ort-tests/tc-fixtures.json.tmp /tc-fixtures.json
(touch test.log && chmod a+rw test.log && tail -f test.log)&

go test --cfg=conf/docker-edge-cache.conf 2>&1 >> test.log
Expand All @@ -115,6 +115,4 @@ if [[ $? != 0 ]]; then
exit 3
fi

cp /tc-fixtures.json /ort-tests/tc-fixtures.json

exit 0
2 changes: 1 addition & 1 deletion cache-config/testing/ort-tests/traffic_ops_ort_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const cfgFmt = `Using Config values:
func TestMain(m *testing.M) {
tcd = tcdata.NewTCData()
configFileName := flag.String("cfg", "conf/traffic-ops-test.conf", "The config file path")
tcFixturesFileName := flag.String("fixtures", "tc-fixtures.json", "The test fixtures for the API test tool")
tcFixturesFileName := flag.String("fixtures", "/tc-fixtures.json", "The test fixtures for the API test tool")
cliIncludeSystemTests := *flag.Bool("includeSystemTests", false, "Whether to enable tests that have environment dependencies beyond a database")
flag.Parse()

Expand Down