Merge branch 'master' into add_stamp_settings

2 files changed, 4 insertions, 3 deletions

diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c
index 69721311..c0eac0e3 100644
--- a/tests/unittests/test_cmd_account.c
+++ b/tests/unittests/test_cmd_account.c
@@ -571,7 +571,8 @@ cmd_account_show_message_for_invalid_otr_policy(void** state)
     expect_any(accounts_account_exists, account_name);
     will_return(accounts_account_exists, TRUE);
 
-    expect_cons_show("OTR policy must be one of: manual, opportunistic or always.");
+    expect_cons_show("Invalid OTR policy: 'bad_otr_policy'");
+    expect_cons_show("OTR policy must be one of: 'manual', 'opportunistic' or 'always'.");
 
     gboolean result = cmd_account_set(NULL, CMD_ACCOUNT, args);
     assert_true(result);
diff --git a/tests/unittests/test_preferences.c b/tests/unittests/test_preferences.c
index f3fe8e3e..ae158ebe 100644
--- a/tests/unittests/test_preferences.c
+++ b/tests/unittests/test_preferences.c
@@ -24,7 +24,7 @@ statuses_chat_defaults_to_all(void** state)
     char* setting = prefs_get_string(PREF_STATUSES_CHAT);
 
     assert_non_null(setting);
-    assert_string_equal("all", setting);
+    assert_string_equal("none", setting);
     g_free(setting);
 }
 
@@ -34,6 +34,6 @@ statuses_muc_defaults_to_all(void** state)
     char* setting = prefs_get_string(PREF_STATUSES_MUC);
 
     assert_non_null(setting);
-    assert_string_equal("all", setting);
+    assert_string_equal("none", setting);
     g_free(setting);
 }