From 5c51474a11604037c3ecf207e0994578538beff9 Mon Sep 17 00:00:00 2001 From: Louis-Philippe Gauthier Date: Mon, 18 Mar 2024 11:59:27 -0400 Subject: [PATCH] Fix tests --- Makefile | 7 +------ include/marina_internal.hrl | 2 +- src/marina_request.erl | 2 +- test/marina_tests.erl | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d72eecb..6b3da98 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ CACHEGRIND=qcachegrind -ELVIS=./bin/elvis REBAR3=$(shell which rebar3) ifeq ($(REBAR3),) REBAR3=./bin/rebar3 @@ -23,10 +22,6 @@ edoc: @echo "Running rebar3 edoc..." @$(REBAR3) as edoc edoc -elvis: - @echo "Running elvis rock..." - @$(ELVIS) rock - eunit: @echo "Running rebar3 eunit..." @$(REBAR3) do eunit -cv, cover -v @@ -42,7 +37,7 @@ profile: @_build/test/lib/fprofx/erlgrindx -p fprofx.analysis @$(CACHEGRIND) fprofx.cgrind -test: elvis xref eunit dialyzer +test: xref eunit dialyzer xref: @echo "Running rebar3 xref..." diff --git a/include/marina_internal.hrl b/include/marina_internal.hrl index 5e2d69f..85aaef8 100644 --- a/include/marina_internal.hrl +++ b/include/marina_internal.hrl @@ -13,7 +13,7 @@ -define(DEFAULT_CONNECT_RETRY, 500). -define(DEFAULT_CONSISTENCY_LEVEL, ?CONSISTENCY_ONE). -define(DEFAULT_FLAGS, []). --define(DEFAULT_IP, "172.18.0.2"). +-define(DEFAULT_IP, "192.168.215.2"). -define(DEFAULT_PID, self()). -define(DEFAULT_POOL_SIZE, 16). -define(DEFAULT_POOL_STRATEGY, random). diff --git a/src/marina_request.erl b/src/marina_request.erl index c522564..a466eea 100644 --- a/src/marina_request.erl +++ b/src/marina_request.erl @@ -93,7 +93,7 @@ startup(FrameFlags) -> marina_frame:encode(#frame { stream = ?DEFAULT_STREAM, opcode = ?OP_STARTUP, - flags = FrameFlags, + flags = 0, body = [marina_types:encode_string_map(Body)] }). diff --git a/test/marina_tests.erl b/test/marina_tests.erl index efd5da1..fa6fc69 100644 --- a/test/marina_tests.erl +++ b/test/marina_tests.erl @@ -244,8 +244,7 @@ query(Query) -> }). setup(KeyVals) -> - application:start(sasl), - % error_logger:tty(false), + error_logger:tty(false), bootstrap(), application:load(marina), set_env(KeyVals),