Merge pull request #529 from rstudio/kegs-rm-mock-connect

Deprecate mock_connect and fix test_main_content tests

Author: dbkegley

Makefile

@@ -19,16 +19,14 @@ ifneq ($(GITHUB_RUN_ID),)
 endif
 
 TEST_ENV =
+TEST_ENV += CONNECT_CONTENT_BUILD_DIR="rsconnect-build-test"
 
 ifneq ($(CONNECT_SERVER),)
   TEST_ENV += CONNECT_SERVER=$(CONNECT_SERVER)
 endif
 ifneq ($(CONNECT_API_KEY),)
   TEST_ENV += CONNECT_API_KEY=$(CONNECT_API_KEY)
 endif
-ifneq ($(CONNECT_CONTENT_BUILD_DIR),)
-	TEST_ENV += CONNECT_CONTENT_BUILD_DIR=$(CONNECT_CONTENT_BUILD_DIR)
-endif
 
 # NOTE: See the `dist` target for why this exists.
 SOURCE_DATE_EPOCH := $(shell date +%s)
@@ -49,16 +47,6 @@ shell-%:
 test-%:
 	PYTHON_VERSION=$* $(RUNNER) '$(TEST_ENV) $(TEST_COMMAND)'
 
-mock-test-%: clean-stores
-	@$(MAKE) -C mock_connect image up
-	@sleep 1
-	trap "$(MAKE) -C mock_connect down" EXIT; \
-	CONNECT_CONTENT_BUILD_DIR="rsconnect-build-test" \
-	CONNECT_SERVER="http://$(HOSTNAME):3939" \
-	CONNECT_API_KEY="21232f297a57a5a743894a0e4a801fc3" \
-	$(MAKE) test-$*
-	@$(MAKE) -C mock_connect down
-
 fmt-%:
 	$(RUNNER) 'black .'