diff --git a/test/expected-issue1037-output b/test/expected-issue1037-output index a5d7c55..e03b110 100644 --- a/test/expected-issue1037-output +++ b/test/expected-issue1037-output @@ -1,4 +1,3 @@ -Root package issue1037-better-dependency-messages reference gitcompatibledubpackage 1.0.1 cannot be satisfied. -Packages causing the conflict: - issue1037-better-dependency-messages depends on 1.0.1 - b depends on ~>1.0.2 +Unresolvable dependencies to package gitcompatibledubpackage: + b >=0.0.0 @DIR/b depends on gitcompatibledubpackage ~>1.0.2 + issue1037-better-dependency-messages ~master depends on gitcompatibledubpackage 1.0.1 diff --git a/test/issue1037-better-dependency-messages.sh b/test/issue1037-better-dependency-messages.sh index 2fe3b9f..c06bdc4 100755 --- a/test/issue1037-better-dependency-messages.sh +++ b/test/issue1037-better-dependency-messages.sh @@ -4,17 +4,21 @@ cd ${CURR_DIR}/issue1037-better-dependency-messages temp_file=$(mktemp $(basename $0).XXXXXX) +temp_file2=$(mktemp $(basename $0).XXXXXX) expected_file="$CURR_DIR/expected-issue1037-output" function cleanup { - rm $temp_file + rm -f $temp_file + rm -f $temp_file } trap cleanup EXIT +sed "s#DIR#$CURR_DIR/issue1037-better-dependency-messages#" "$expected_file" > "$temp_file2" + $DUB upgrade 2>$temp_file && exit 1 # dub upgrade should fail -if ! diff "$expected_file" "$temp_file"; then +if ! diff "$temp_file2" "$temp_file"; then die 'output not containing conflict information' fi