mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 01:14:53 +01:00
test: reorganize tests and mark a few of them as broken
notmuch_message_remove_all_properties should have removed the testkey1 = testvalue1 property but hasn't. Delay the execution of the corresponding test to avoid updating a few tests that actually relied on the broken behavior.
This commit is contained in:
parent
552d9ec9f7
commit
e191d3c574
1 changed files with 22 additions and 17 deletions
|
@ -89,17 +89,6 @@ testkey2 = NULL
|
|||
EOF
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "notmuch_message_remove_all_properties"
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_remove_all_properties (message, NULL));
|
||||
print_properties (message, "", FALSE);
|
||||
EOF
|
||||
cat <<'EOF' >EXPECTED
|
||||
== stdout ==
|
||||
== stderr ==
|
||||
EOF
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "testing string map binary search (via message properties)"
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
{
|
||||
|
@ -162,7 +151,19 @@ testkey1 = testvalue1
|
|||
EOF
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "notmuch_message_remove_all_properties"
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_remove_all_properties (message, NULL));
|
||||
print_properties (message, "", FALSE);
|
||||
EOF
|
||||
cat <<'EOF' >EXPECTED
|
||||
== stdout ==
|
||||
== stderr ==
|
||||
EOF
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "notmuch_message_properties: multiple values"
|
||||
test_subtest_known_broken
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_add_property (message, "testkey1", "bob"));
|
||||
EXPECT0(notmuch_message_add_property (message, "testkey1", "testvalue2"));
|
||||
|
@ -173,13 +174,13 @@ cat <<'EOF' >EXPECTED
|
|||
== stdout ==
|
||||
testkey1 = alice
|
||||
testkey1 = bob
|
||||
testkey1 = testvalue1
|
||||
testkey1 = testvalue2
|
||||
== stderr ==
|
||||
EOF
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "notmuch_message_properties: prefix"
|
||||
test_subtest_known_broken
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_add_property (message, "testkey3", "bob3"));
|
||||
EXPECT0(notmuch_message_add_property (message, "testkey3", "testvalue3"));
|
||||
|
@ -190,7 +191,6 @@ cat <<'EOF' >EXPECTED
|
|||
== stdout ==
|
||||
testkey1 = alice
|
||||
testkey1 = bob
|
||||
testkey1 = testvalue1
|
||||
testkey1 = testvalue2
|
||||
testkey3 = alice3
|
||||
testkey3 = bob3
|
||||
|
@ -235,8 +235,9 @@ EOF
|
|||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "dump message properties"
|
||||
test_subtest_known_broken
|
||||
cat <<EOF > PROPERTIES
|
||||
#= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue1 testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3
|
||||
#= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3
|
||||
EOF
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_add_property (message, "fancy key with áccènts", "import value with ="));
|
||||
|
@ -245,15 +246,17 @@ notmuch dump | grep '^#=' > OUTPUT
|
|||
test_expect_equal_file PROPERTIES OUTPUT
|
||||
|
||||
test_begin_subtest "dump _only_ message properties"
|
||||
test_subtest_known_broken
|
||||
cat <<EOF > EXPECTED
|
||||
#notmuch-dump batch-tag:3 properties
|
||||
#= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue1 testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3
|
||||
#= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3
|
||||
EOF
|
||||
notmuch dump --include=properties > OUTPUT
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
|
||||
test_begin_subtest "restore missing message property (single line)"
|
||||
test_subtest_known_broken
|
||||
notmuch dump | grep '^#=' > BEFORE1
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_remove_property (message, "testkey1", "bob"));
|
||||
|
@ -264,6 +267,7 @@ test_expect_equal_file PROPERTIES OUTPUT
|
|||
|
||||
|
||||
test_begin_subtest "restore missing message property (full dump)"
|
||||
test_subtest_known_broken
|
||||
notmuch dump > BEFORE2
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_remove_property (message, "testkey1", "bob"));
|
||||
|
@ -273,6 +277,7 @@ notmuch dump | grep '^#=' > OUTPUT
|
|||
test_expect_equal_file PROPERTIES OUTPUT
|
||||
|
||||
test_begin_subtest "restore clear extra message property"
|
||||
test_subtest_known_broken
|
||||
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
|
||||
EXPECT0(notmuch_message_add_property (message, "testkey1", "charles"));
|
||||
EOF
|
||||
|
@ -306,6 +311,7 @@ EOF
|
|||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "msg.get_properties (python)"
|
||||
test_subtest_known_broken
|
||||
test_python <<'EOF'
|
||||
import notmuch
|
||||
db = notmuch.Database(mode=notmuch.Database.MODE.READ_ONLY)
|
||||
|
@ -316,12 +322,12 @@ EOF
|
|||
cat <<'EOF' > EXPECTED
|
||||
testkey1 = alice
|
||||
testkey1 = bob
|
||||
testkey1 = testvalue1
|
||||
testkey1 = testvalue2
|
||||
EOF
|
||||
test_expect_equal_file EXPECTED OUTPUT
|
||||
|
||||
test_begin_subtest "msg.get_properties (python, prefix)"
|
||||
test_subtest_known_broken
|
||||
test_python <<'EOF'
|
||||
import notmuch
|
||||
db = notmuch.Database(mode=notmuch.Database.MODE.READ_ONLY)
|
||||
|
@ -332,7 +338,6 @@ EOF
|
|||
cat <<'EOF' > EXPECTED
|
||||
testkey1 = alice
|
||||
testkey1 = bob
|
||||
testkey1 = testvalue1
|
||||
testkey1 = testvalue2
|
||||
testkey3 = alice3
|
||||
testkey3 = bob3
|
||||
|
|
Loading…
Reference in a new issue