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

Commit

Permalink
Merge pull request #1661 from endocode/dongsu/cleanup-old-cmds-fxtests
Browse files Browse the repository at this point in the history
functional: clean up obsolete commands that are commented out
  • Loading branch information
Dongsu Park committed Aug 16, 2016
2 parents fa07fa5 + 444be75 commit 150d30c
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions functional/test
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

0 comments on commit 150d30c

Please sign in to comment.