working api-test flow

Makefile

@@ -5,7 +5,7 @@ export HOST_UID := $(shell id -u)
 export HOST_GID := $(shell id -g)
 
 all: build
-
+	
 build:
 	@$(ECHO) "$(CYAN)*** Building...$(OFF)"
 	@$(MAKE) oasis-indexer
@@ -58,11 +58,13 @@ test-e2e: export OASIS_INDEXER_E2E = true
 test-e2e:
 	@$(GO) test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic -v ./tests/e2e
 
+dump-state: export OASIS_INDEXER_DUMP_NODE_DATA=true
 dump-state:
-	@OASIS_INDEXER_DUMP_NODE_DATA=true && $(GO) test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic -v ./tests/api
+	@$(GO) test -race -v ./tests/api
 
+test-api: export OASIS_INDEXER_API_TESTS=true
 test-api:
-	@OASIS_INDEXER_API_TESTS=true && $(GO) test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic -v ./tests/api
+	@$(GO) test -race -v ./tests/api
 	./tests/e2e_regression/run.sh
 
 # Format code.

tests/api/api_test.go

@@ -43,6 +43,7 @@ func TestRunFileBasedIndexer(t *testing.T) {
 	require.Nil(t, err)
 
 	consensusAnalyzer, err := consensus.NewMain(cfg.Analysis.Node, cfg.Analysis.Analyzers.Consensus, target, logger)
+	require.Nil(t, err)
 
 	// Initialize file-based source storage.
 	// TODO: rip this out once the config changes go in

tests/api/util_test.go

@@ -45,6 +45,7 @@ func TestDumpConsensusNodeData(t *testing.T) {
 
 	// Initialize consensus analyzer.
 	consensusAnalyzer, err := consensus.NewMain(cfg.Analysis.Node, cfg.Analysis.Analyzers.Consensus, target, logger)
+	require.Nil(t, err)
 
 	// Initialize file-based source storage.
 	// TODO: rip this out once the config changes go in

tests/e2e_regression/run.sh

@@ -69,18 +69,19 @@ testCases=(
 nCases=${#testCases[@]}
 
 # Kill background processes on exit. (In our case the indexer API server.)
+# todo: this doesn't work on MacOS. 
 trap 'trap - SIGTERM && kill -- -$$' SIGINT SIGTERM EXIT
 
 # Start the API server.
 make oasis-indexer
-./oasis-indexer --config="${SCRIPT_DIR}/e2e_config.yaml" serve &
+./oasis-indexer --config="${SCRIPT_DIR}/../api/api-dev.yml" serve &
 while ! curl --silent localhost:8008/v1/ >/dev/null; do
   echo "Waiting for API server to start..."
   sleep 1
 done
 
 # Run the test cases.
-seen=()
+seen=("placeholder") # avoids 'seen[*]: unbound variable' error on zsh
 for (( i=0; i<nCases; i++ )); do
   name="$(echo "${testCases[$i]}" | awk '{print $1}')"
   url="$(echo "${testCases[$i]}" | awk '{print $2}')"
@@ -103,7 +104,7 @@ for (( i=0; i<nCases; i++ )); do
     >/tmp/pretty 2>/dev/null \
   && cp /tmp/pretty "$outDir/$name.body" || true
   # Sanitize the current timestamp out of the response header so that diffs are stable
-  sed -E -i 's/^(Date|Content-Length|Last-Modified): .*/\1: UNINTERESTING/g' "$outDir/$name.headers"
+  sed -E -i '' 's/^(Date|Content-Length|Last-Modified): .*/\1: UNINTERESTING/g' "$outDir/$name.headers"
 done
 
 diff --recursive "$SCRIPT_DIR/expected" "$outDir" >/dev/null || {