Permalink
Browse files

fn: api-tests are decommissioned: cleanup Makefile (#1082)

* fn: api-tests are decommissioned: cleanup Makefile

* fn: increase mem in system-tests due to fn-test-utils image
  • Loading branch information...
skinowski committed Jun 21, 2018
1 parent 7dd4be5 commit f8d737dd46a91393467bea353b1cb03bbde8de02
Showing with 7 additions and 43 deletions.
  1. +2 −7 Makefile
  2. +0 −33 api_test.sh
  3. +4 −2 system_test.sh
  4. +1 −1 test/fn-system-tests/exec_test.go
@@ -1,5 +1,5 @@
# Just builds
.PHONY: all test dep build test-log-datastore checkfmt pull-images api-test fn-test-utils test-middleware test-extensions test-basic test-api
.PHONY: all test dep build test-log-datastore checkfmt pull-images fn-test-utils test-middleware test-extensions test-basic
dep:
dep ensure --vendor-only
@@ -43,12 +43,7 @@ test-extensions: test-basic
test-basic: checkfmt pull-images fn-test-utils
./test.sh
test: checkfmt pull-images test-basic test-middleware test-extensions test-api test-system
test-api: test-basic
./api_test.sh sqlite3
./api_test.sh mysql
./api_test.sh postgres
test: checkfmt pull-images test-basic test-middleware test-extensions test-system
test-system: test-basic
./system_test.sh sqlite3

This file was deleted.

Oops, something went wrong.
@@ -1,5 +1,5 @@
#!/bin/bash
set -exo pipefail
set -exuo pipefail
export CONTEXT="fn_system_tests"
source ./helpers.sh
@@ -22,6 +22,8 @@ export FN_ENABLE_NB_RESOURCE_TRACKER=1
#
export SYSTEM_TEST_PROMETHEUS_FILE=./prometheus.${DB_NAME}.txt
cd test/fn-system-tests && FN_DB_URL=${FN_DB_URL} FN_API_URL=${FN_API_URL} go test -v ./...; cd ../../
cd test/fn-system-tests
go test -v ./...
cd ../../
remove_containers ${CONTEXT}
@@ -349,7 +349,7 @@ const (
routeName = "/systemtestroute"
image = "fnproject/fn-test-utils"
format = "json"
memory = 64
memory = 128
typ = "sync"
)

0 comments on commit f8d737d

Please sign in to comment.