From 0f66b6e72621842467d0e368b95ee58f485d4ace Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 9 Oct 2017 10:16:14 -0700 Subject: store/sqlstore cleanup and postgres tests (#7595) * sqlstore cleanup / postgres tests * remove stopped containers * cmd/platform compile fix * remove test-postgres target from makefile --- Makefile | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 07823082b..4bacfa3b4 100644 --- a/Makefile +++ b/Makefile @@ -343,22 +343,6 @@ ifeq ($(BUILD_ENTERPRISE_READY),true) rm -f config/*.key endif -test-postgres: - @echo Testing Postgres - - @sed -i'' -e 's|"DriverName": "mysql"|"DriverName": "postgres"|g' config/config.json - @sed -i'' -e 's|"DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"|"DataSource": "postgres://mmuser:mostest@dockerhost:5432?sslmode=disable"|g' config/config.json - - $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=2000s -covermode=count -coverprofile=cprofile.out -coverpkg=$(ALL_PACKAGES_COMMA) github.com/mattermost/mattermost-server/store/sqlstore || exit 1; \ - if [ -f cprofile.out ]; then \ - tail -n +2 cprofile.out >> cover.out; \ - rm cprofile.out; \ - fi; \ - - @sed -i'' -e 's|"DataSource": "postgres://mmuser:mostest@dockerhost:5432?sslmode=disable"|"DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"|g' config/config.json - @sed -i'' -e 's|"DriverName": "postgres"|"DriverName": "mysql"|g' config/config.json - @rm config/config.json-e - test-server: test-te test-ee internal-test-web-client: -- cgit v1.2.3-1-g7c22