Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

functional: clean up obsolete commands that are commented out #1661

Merged
merged 1 commit into from
Aug 16, 2016
Merged

functional: clean up obsolete commands that are commented out #1661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions functional/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ if [ ! -x "bin/fleetd" ] || \
./build
fi

#go test github.com/coreos/fleet/functional -ldflags "${GLDFLAGS}" -v "$@" 2>&1 | tee functional/functional-tests.log

# Phase 1: run tests with gRPC disabled
export FLEETD_TEST_ENV="enable_grpc=false"
go test github.com/coreos/fleet/functional -ldflags "${GLDFLAGS}" -v "$@" 2>&1 | sed -u -r "s/^(---\s+(:?PASS|SKIP|FAIL):\s+Test[^\(]*)/\\1(fleet.conf=\[$FLEETD_TEST_ENV\]) /g;s/^(=== RUN\s+Test.*)/\1 (fleet.conf=\[$FLEETD_TEST_ENV\])/g" | tee -a functional/functional-tests.log
Expand All @@ -87,6 +85,5 @@ export FLEETD_TEST_ENV="enable_grpc=true"
go test github.com/coreos/fleet/functional -ldflags "${GLDFLAGS}" -v "$@" 2>&1 | sed -u -r "s/^(---\s+(:?PASS|SKIP|FAIL):\s+Test[^\(]*)/\\1(fleet.conf=\[$FLEETD_TEST_ENV\]) /g;s/^(=== RUN\s+Test.*)/\1 (fleet.conf=\[$FLEETD_TEST_ENV\])/g" | tee -a functional/functional-tests.log

TESTS_RETURN_CODE_2=${PIPESTATUS[0]}
#TESTS_RETURN_CODE_2=0

print_results