From 50ac166cffd2632f7a37b64c78ad1507dce5732c Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 14 Jul 2015 23:36:39 +0100
Subject: [PATCH] Reverted previous attempt to get expect working on osx

---
 tests/functionaltests/functionaltests.c |  8 +++++---
 tests/functionaltests/proftest.c        | 15 ++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c
index 1ed7ea2b..da7585bc 100644
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -21,13 +21,14 @@
 int main(int argc, char* argv[]) {
 
     const UnitTest all_tests[] = {
+
+/*
         unit_test_setup_teardown(connect_jid_requests_roster,
             init_prof_test,
             close_prof_test),
         unit_test_setup_teardown(connect_jid_sends_presence_after_receiving_roster,
             init_prof_test,
             close_prof_test),
-/*
         unit_test_setup_teardown(connect_jid_requests_bookmarks,
             init_prof_test,
             close_prof_test),
@@ -55,9 +56,11 @@ int main(int argc, char* argv[]) {
         unit_test_setup_teardown(presence_away_with_message,
             init_prof_test,
             close_prof_test),
+*/
         unit_test_setup_teardown(presence_online,
             init_prof_test,
             close_prof_test),
+/*
         unit_test_setup_teardown(presence_online_with_message,
             init_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,
             init_prof_test,
             close_prof_test),
-
+*/
         unit_test_setup_teardown(send_enable_carbons,
             init_prof_test,
             close_prof_test),
-*/
     };
 
     return run_tests(all_tests);
diff --git a/tests/functionaltests/proftest.c b/tests/functionaltests/proftest.c
index 0d8cec4f..9cb11770 100644
--- a/tests/functionaltests/proftest.c
+++ b/tests/functionaltests/proftest.c
@@ -16,7 +16,6 @@
 #include <expect.h>
 #include <expect_tcl.h>
 
-
 #include "proftest.h"
 
 char *config_orig;
@@ -148,11 +147,10 @@ prof_start(void)
 void
 init_prof_test(void **state)
 {
-    stbbr_start(STBBR_LOGDEBUG ,5230, 0);
-//    if (stbbr_start(STBBR_LOGDEBUG ,5230, 0) != 0) {
-//        assert_true(FALSE);
-//        return;
-//    }
+    if (stbbr_start(STBBR_LOGDEBUG ,5230, 0) != 0) {
+        assert_true(FALSE);
+        return;
+    }
 
     config_orig = getenv("XDG_CONFIG_HOME");
     data_orig = getenv("XDG_DATA_HOME");
@@ -187,9 +185,8 @@ init_prof_test(void **state)
 void
 close_prof_test(void **state)
 {
-//    prof_input("/quit");
-//    waitpid(exp_pid, NULL, 0);
-    kill(exp_pid, SIGKILL);
+    prof_input("/quit");
+    waitpid(exp_pid, NULL, 0);
 
     _cleanup_dirs();