Remove color default options for running tests.

2025-01-08 20:54:28 +03:00 · 2020-09-14 21:22:11 +02:00 · 2020-09-14 21:22:11 +02:00 · 4888f44759
commit 4888f44759
parent 1daf83dc99
55 changed files with 67 additions and 65 deletions
--- a/integration/run.sh
+++ b/integration/run.sh
@ -5,7 +5,7 @@ set -e
 for hurl_file in "$@"; do
    set +e

-    options=("--color")
+    options=("")
    if test -f "${hurl_file%.*}.options"; then
        options+=("$(cat "${hurl_file%.*}.options")")
    fi
--- a/integration/tests/error_assert_base64.err
+++ b/integration/tests/error_assert_base64.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Body Value
+error: Assert Body Value
  --> tests/error_assert_base64.hurl:12:8
   |
 12 | base64,bGluZTEKbGluZTIKbGluZTMK;
--- a/integration/tests/error_assert_file.err
+++ b/integration/tests/error_assert_file.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Body Value
+error: Assert Body Value
  --> tests/error_assert_file.hurl:8:1
   |
 8 | file,hello.txt;
--- a/integration/tests/error_assert_header_not_found.err
+++ b/integration/tests/error_assert_header_not_found.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Header not Found
+error: Header not Found
  --> tests/error_assert_header_not_found.hurl:3:1
   |
 3 | Custom: ???
--- a/integration/tests/error_assert_header_value.err
+++ b/integration/tests/error_assert_header_value.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Header Value
+error: Assert Header Value
  --> tests/error_assert_header_value.hurl:3:15
   |
 3 | Content-Type: ???
--- a/integration/tests/error_assert_http_version.err
+++ b/integration/tests/error_assert_http_version.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Http Version
+error: Assert Http Version
  --> tests/error_assert_http_version.hurl:2:6
   |
 2 | HTTP/2 200
--- a/integration/tests/error_assert_invalid_predicate_type.err
+++ b/integration/tests/error_assert_invalid_predicate_type.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_assert_invalid_predicate_type.hurl:4:0
   |
 4 | header "content-type" equals 1
--- a/integration/tests/error_assert_match_utf8.err
+++ b/integration/tests/error_assert_match_utf8.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid Utf8
+error: Invalid Utf8
  --> tests/error_assert_match_utf8.hurl:4:1
   |
 4 | body matches ".*"
--- a/integration/tests/error_assert_query_invalid_regex.err
+++ b/integration/tests/error_assert_query_invalid_regex.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid regex
+error: Invalid regex
  --> tests/error_assert_query_invalid_regex.hurl:4:7
   |
 4 | regex "[x" exists
--- a/integration/tests/error_assert_query_invalid_xpath.err
+++ b/integration/tests/error_assert_query_invalid_xpath.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid xpath expression
+error: Invalid xpath expression
  --> tests/error_assert_query_invalid_xpath.hurl:4:7
   |
 4 | xpath "//" equals 1
--- a/integration/tests/error_assert_status.err
+++ b/integration/tests/error_assert_status.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Status
+error: Assert Status
  --> tests/error_assert_status.hurl:2:10
   |
 2 | HTTP/1.0 200
--- a/integration/tests/error_assert_template_variable_not_found.err
+++ b/integration/tests/error_assert_template_variable_not_found.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Undefined Variable
+error: Undefined Variable
  --> tests/error_assert_template_variable_not_found.hurl:4:33
   |
 4 | header "content-type" equals "{{content_type}}"
--- a/integration/tests/error_assert_value_error.err
+++ b/integration/tests/error_assert_value_error.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_assert_value_error.hurl:4:0
   |
 4 | header "content-type" equals "XXX"
@ -6,7 +6,7 @@
   |   expected: string <XXX>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_assert_value_error.hurl:5:0
   |
 5 | jsonpath "$.id" equals "000001"
@ -14,7 +14,7 @@
   |   expected: string <000001>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_assert_value_error.hurl:6:0
   |
 6 | jsonpath "$.values" includes 100
--- a/integration/tests/error_assert_variable.options
+++ b/integration/tests/error_assert_variable.options
@ -0,0 +1 @@
+--color
--- a/integration/tests/error_file_read_access.err
+++ b/integration/tests/error_file_read_access.err
@ -1,4 +1,4 @@
-[1;31merror[0m: File ReadAccess
+error: File ReadAccess
  --> tests/error_file_read_access.hurl:2:6
   |
 2 | file,does_not_exist;
--- a/integration/tests/error_http_connection.err
+++ b/integration/tests/error_http_connection.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Http Connection
+error: Http Connection
  --> tests/error_http_connection.hurl:1:5
   |
 1 | GET http://unknown
--- a/integration/tests/error_invalid_jsonpath.err
+++ b/integration/tests/error_invalid_jsonpath.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid jsonpath
+error: Invalid jsonpath
  --> tests/error_invalid_jsonpath.hurl:4:10
   |
 4 | jsonpath "" equals false
--- a/integration/tests/error_invalid_url.err
+++ b/integration/tests/error_invalid_url.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid url
+error: Invalid url
  --> tests/error_invalid_url.hurl:1:5
   |
 1 | GET unknown
--- a/integration/tests/error_invalid_xml.err
+++ b/integration/tests/error_invalid_xml.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid XML
+error: Invalid XML
  --> tests/error_invalid_xml.hurl:4:1
   |
 4 | xpath "xx" equals 1
--- a/integration/tests/error_multipart_form_data.err
+++ b/integration/tests/error_multipart_form_data.err
@ -1,4 +1,4 @@
-[1;31merror[0m: File ReadAccess
+error: File ReadAccess
  --> tests/error_multipart_form_data.hurl:4:15
   |
 4 | upload1: file,unknown;
--- a/integration/tests/error_predicate.err
+++ b/integration/tests/error_predicate.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:4:0
   |
 4 | jsonpath "$.status" equals "true"
@ -6,7 +6,7 @@
   |   expected: string <true>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:6:0
   |
 6 | jsonpath "$.count" equals 0
@ -14,7 +14,7 @@
   |   expected: int <0>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:7:0
   |
 7 | jsonpath "$.message" equals 0
@ -22,7 +22,7 @@
   |   expected: int <0>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:8:0
   |
 8 | jsonpath "$.empty" equals 0
@ -30,7 +30,7 @@
   |   expected: int <0>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:9:0
   |
 9 | jsonpath "$.number" equals 1.1
@ -38,7 +38,7 @@
   |   expected: float <1.100000000000000000>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:10:0
   |
 10 | jsonpath "$.message" startsWith "hi"
@ -46,7 +46,7 @@
   |   expected: starts with string <hi>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:11:0
   |
 11 | jsonpath "$.message" contains "hi"
@ -54,7 +54,7 @@
   |   expected: contains string <hi>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:12:0
   |
 12 | jsonpath "$.message" matches "hi"
@ -62,7 +62,7 @@
   |   expected: matches regex <hi>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:13:0
   |
 13 | jsonpath "$.message" countEquals 1
@ -70,7 +70,7 @@
   |   expected: count equals to <1>
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:14:0
   |
 14 | jsonpath "$.toto" exists
@ -78,7 +78,7 @@
   |   expected: something
   |

-[1;31merror[0m: Assert Failure
+error: Assert Failure
  --> tests/error_predicate.hurl:15:0
   |
 15 | jsonpath "$.message" not exists
--- a/integration/tests/error_query_header_not_found.err
+++ b/integration/tests/error_query_header_not_found.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Header not Found
+error: Header not Found
  --> tests/error_query_header_not_found.hurl:3:1
   |
 3 | Custom: XXX
--- a/integration/tests/error_query_invalid_json.err
+++ b/integration/tests/error_query_invalid_json.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid Json
+error: Invalid Json
  --> tests/error_query_invalid_json.hurl:4:1
   |
 4 | jsonpath "$.errors" countEquals 2
--- a/integration/tests/error_query_invalid_utf8.err
+++ b/integration/tests/error_query_invalid_utf8.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Invalid Utf8
+error: Invalid Utf8
  --> tests/error_query_invalid_utf8.hurl:4:1
   |
 4 | jsonpath "$.errors" countEquals 2
--- a/integration/tests/error_template_variable_not_found.options
+++ b/integration/tests/error_template_variable_not_found.options
@ -0,0 +1 @@
+--color
--- a/integration/tests/error_template_variable_not_renderable.err
+++ b/integration/tests/error_template_variable_not_renderable.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Unrenderable Variable
+error: Unrenderable Variable
  --> tests/error_template_variable_not_renderable.hurl:8:11
   |
 8 | param1: {{list}}
--- a/integration/tests/follow_redirect.options
+++ b/integration/tests/follow_redirect.options
@ -1 +1 @@
-L --verbose
+-L
--- a/integration/tests_error_parser/base64.err
+++ b/integration/tests_error_parser/base64.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/base64.hurl:2:14
   |
 2 | base64, aaaaa?
--- a/integration/tests_error_parser/duplicate_section.err
+++ b/integration/tests_error_parser/duplicate_section.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing section
+error: Parsing section
  --> tests_error_parser/duplicate_section.hurl:4:1
   |
 4 | [QueryStringParams]
--- a/integration/tests_error_parser/file.err
+++ b/integration/tests_error_parser/file.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing Filename
+error: Parsing Filename
  --> tests_error_parser/file.hurl:2:6
   |
 2 | file,
--- a/integration/tests_error_parser/file_missing_delimiter.err
+++ b/integration/tests_error_parser/file_missing_delimiter.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/file_missing_delimiter.hurl:2:16
   |
 2 | file, data.bin ?
--- a/integration/tests_error_parser/invalid_character_at_end.err
+++ b/integration/tests_error_parser/invalid_character_at_end.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing Method
+error: Parsing Method
  --> tests_error_parser/invalid_character_at_end.hurl:3:1
   |
 3 | XXX
--- a/integration/tests_error_parser/invalid_cookiepath.err
+++ b/integration/tests_error_parser/invalid_cookiepath.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing cookie attribute
+error: Parsing cookie attribute
  --> tests_error_parser/invalid_cookiepath.hurl:4:17
   |
 4 | cookie "cookie1[X]" equals "1"
--- a/integration/tests_error_parser/invalid_escape.err
+++ b/integration/tests_error_parser/invalid_escape.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing escape character
+error: Parsing escape character
  --> tests_error_parser/invalid_escape.hurl:4:25
   |
 4 | xpath "//item" equals "\d\d\d\d-\d\d-\d\d"
--- a/integration/tests_error_parser/invalid_file.err
+++ b/integration/tests_error_parser/invalid_file.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing Filename
+error: Parsing Filename
  --> tests_error_parser/invalid_file.hurl:2:6
   |
 2 | file,/data.bin;
--- a/integration/tests_error_parser/invalid_jsonpath.err
+++ b/integration/tests_error_parser/invalid_jsonpath.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/invalid_jsonpath.hurl:4:10
   |
 4 | jsonpath ?? equals 1
--- a/integration/tests_error_parser/invalid_section.err
+++ b/integration/tests_error_parser/invalid_section.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing section
+error: Parsing section
  --> tests_error_parser/invalid_section.hurl:2:1
   |
 2 | [Asserts]
--- a/integration/tests_error_parser/invalid_url.err
+++ b/integration/tests_error_parser/invalid_url.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/invalid_url.hurl:1:26
   |
 1 | GET http://localhost:8000> #
--- a/integration/tests_error_parser/invalid_xpath.err
+++ b/integration/tests_error_parser/invalid_xpath.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/invalid_xpath.hurl:4:7
   |
 4 | xpath ?? equals 1
--- a/integration/tests_error_parser/json.err
+++ b/integration/tests_error_parser/json.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing json
+error: Parsing json
  --> tests_error_parser/json.hurl:2:10
   |
 2 | { "name":
--- a/integration/tests_error_parser/json_unexpected_character.err
+++ b/integration/tests_error_parser/json_unexpected_character.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing json
+error: Parsing json
  --> tests_error_parser/json_unexpected_character.hurl:2:10
   |
 2 | { "name": x
--- a/integration/tests_error_parser/json_unexpected_eof.err
+++ b/integration/tests_error_parser/json_unexpected_eof.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing json
+error: Parsing json
  --> tests_error_parser/json_unexpected_eof.hurl:2:10
   |
 2 | { "name":
--- a/integration/tests_error_parser/jsonpath.err
+++ b/integration/tests_error_parser/jsonpath.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing jsonpath expression
+error: Parsing jsonpath expression
  --> tests_error_parser/jsonpath.hurl:4:10
   |
 4 | jsonpath ? equals 1
--- a/integration/tests_error_parser/method.err
+++ b/integration/tests_error_parser/method.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing Method
+error: Parsing Method
  --> tests_error_parser/method.hurl:1:1
   |
 1 | GeT http://localhost:8000/hello
--- a/integration/tests_error_parser/predicate.err
+++ b/integration/tests_error_parser/predicate.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing predicate
+error: Parsing predicate
  --> tests_error_parser/predicate.hurl:3:15
   |
 3 | header "toto" tata startsWith "hello"
--- a/integration/tests_error_parser/predicate_count_equal_value.err
+++ b/integration/tests_error_parser/predicate_count_equal_value.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing predicate value
+error: Parsing predicate value
  --> tests_error_parser/predicate_count_equal_value.hurl:3:28
   |
 3 | xpath "//user" countEquals true
--- a/integration/tests_error_parser/predicate_equal_value.err
+++ b/integration/tests_error_parser/predicate_equal_value.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing predicate value
+error: Parsing predicate value
  --> tests_error_parser/predicate_equal_value.hurl:3:22
   |
 3 | header "toto" equals xx
--- a/integration/tests_error_parser/predicate_startwith_value.err
+++ b/integration/tests_error_parser/predicate_startwith_value.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/predicate_startwith_value.hurl:3:26
   |
 3 | header "toto" startsWith 1
--- a/integration/tests_error_parser/regex.err
+++ b/integration/tests_error_parser/regex.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing literal
+error: Parsing literal
  --> tests_error_parser/regex.hurl:5:7
   |
 5 | regex ?? not exists
--- a/integration/tests_error_parser/section_name.err
+++ b/integration/tests_error_parser/section_name.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing section name
+error: Parsing section name
  --> tests_error_parser/section_name.hurl:2:2
   |
 2 | [Unknown]
--- a/integration/tests_error_parser/space.err
+++ b/integration/tests_error_parser/space.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing space
+error: Parsing space
  --> tests_error_parser/space.hurl:1:4
   |
 1 | GET
--- a/integration/tests_error_parser/status.err
+++ b/integration/tests_error_parser/status.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing Status
+error: Parsing Status
  --> tests_error_parser/status.hurl:2:10
   |
 2 | HTTP/1.1 oa0
--- a/integration/tests_error_parser/template_variable.err
+++ b/integration/tests_error_parser/template_variable.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing template variable
+error: Parsing template variable
  --> tests_error_parser/template_variable.hurl:1:7
   |
 1 | GET {{}}
--- a/integration/tests_error_parser/version.err
+++ b/integration/tests_error_parser/version.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Parsing Version
+error: Parsing Version
  --> tests_error_parser/version.hurl:2:6
   |
 2 | HTTP/11 200
--- a/integration/tests_error_parser/xml.err
+++ b/integration/tests_error_parser/xml.err
@ -1,4 +1,4 @@
-[1;31merror[0m: Error { pos: Pos { line: 2, column: 1 }, recoverable: false, inner: Xml }
+error: Error { pos: Pos { line: 2, column: 1 }, recoverable: false, inner: Xml }
  --> tests_error_parser/xml.hurl:2:1
   |
 2 | <users><user>