diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 14:58:57 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 14:58:57 +0100 |
| commit | 31a0358afb4fde998d1eeeaa80fc32e4420266c7 (patch) | |
| tree | 938455353474196c1f49b0529b5b644e19c21f3e /tests/auto/testlib/selftests/expected_datetime.xunitxml | |
| parent | 4c8a4058c359c8d163c643120426079fc80c8214 (diff) | |
| parent | 69da8588d41bbf5ab785f5ad7c1fce76deefc7d0 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qbytearray.h
Change-Id: I03b1f3e05c9b7a45130887c522fcd9b7aa387129
Diffstat (limited to 'tests/auto/testlib/selftests/expected_datetime.xunitxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_datetime.xunitxml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.xunitxml index b30d1c441f..f25e20674b 100644 --- a/tests/auto/testlib/selftests/expected_datetime.xunitxml +++ b/tests/auto/testlib/selftests/expected_datetime.xunitxml @@ -11,10 +11,10 @@ Expected (utc): 2000/05/03 04:03:04.000[UTC]" result="fail"/> </testcase> <testcase result="fail" name="qurl"> - <failure message="Compared values are not the same + <failure tag="empty rhs" message="Compared values are not the same Actual (operandA): http://example.com Expected (operandB): " result="fail"/> - <failure message="Compared values are not the same + <failure tag="empty lhs" message="Compared values are not the same Actual (operandA): Expected (operandB): http://example.com" result="fail"/> </testcase> |