aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Reverted previous attempt to get expect working on osx

Browse Source
This commit is contained in:
James Booth 2015-07-14 23:36:39 +01:00
parent 3fb24162bc
commit 50ac166cff
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/functionaltests/functionaltests.c
View File

@ -21,13 +21,14 @@
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
const UnitTest all_tests[] = { const UnitTest all_tests[] = {
/*
unit_test_setup_teardown(connect_jid_requests_roster, unit_test_setup_teardown(connect_jid_requests_roster,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
unit_test_setup_teardown(connect_jid_sends_presence_after_receiving_roster, unit_test_setup_teardown(connect_jid_sends_presence_after_receiving_roster,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
/*
unit_test_setup_teardown(connect_jid_requests_bookmarks, unit_test_setup_teardown(connect_jid_requests_bookmarks,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
@ -55,9 +56,11 @@ int main(int argc, char* argv[]) {
unit_test_setup_teardown(presence_away_with_message, unit_test_setup_teardown(presence_away_with_message,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
*/
unit_test_setup_teardown(presence_online, unit_test_setup_teardown(presence_online,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
/*
unit_test_setup_teardown(presence_online_with_message, unit_test_setup_teardown(presence_online_with_message,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
@ -114,11 +117,10 @@ int main(int argc, char* argv[]) {
unit_test_setup_teardown(new_session_when_message_received_from_different_fulljid, unit_test_setup_teardown(new_session_when_message_received_from_different_fulljid,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
*/
unit_test_setup_teardown(send_enable_carbons, unit_test_setup_teardown(send_enable_carbons,
init_prof_test, init_prof_test,
close_prof_test), close_prof_test),
*/
}; };
return run_tests(all_tests); return run_tests(all_tests);

15
tests/functionaltests/proftest.c
View File

@ -16,7 +16,6 @@
#include <expect.h> #include <expect.h>
#include <expect_tcl.h> #include <expect_tcl.h>
#include "proftest.h" #include "proftest.h"
char *config_orig; char *config_orig;
@ -148,11 +147,10 @@ prof_start(void)
void void
init_prof_test(void **state) init_prof_test(void **state)
{ {
stbbr_start(STBBR_LOGDEBUG ,5230, 0); if (stbbr_start(STBBR_LOGDEBUG ,5230, 0) != 0) {
// if (stbbr_start(STBBR_LOGDEBUG ,5230, 0) != 0) { assert_true(FALSE);
// assert_true(FALSE); return;
// return; }
// }
config_orig = getenv("XDG_CONFIG_HOME"); config_orig = getenv("XDG_CONFIG_HOME");
data_orig = getenv("XDG_DATA_HOME"); data_orig = getenv("XDG_DATA_HOME");
@ -187,9 +185,8 @@ init_prof_test(void **state)
void void
close_prof_test(void **state) close_prof_test(void **state)
{ {
// prof_input("/quit"); prof_input("/quit");
// waitpid(exp_pid, NULL, 0); waitpid(exp_pid, NULL, 0);
kill(exp_pid, SIGKILL);
_cleanup_dirs(); _cleanup_dirs();