about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-10-13 00:10:28 +0100
committerJames Booth <boothj5@gmail.com>2015-10-13 00:10:28 +0100
commite7b4f0bd784e93ac07dea4ba6a49eed08be5e325 (patch)
tree5c6e3490ecd12723f976ceccf012087f55ba4758
parent164620f4bba3de407b254ce35f115f8cded7a721 (diff)
downloadprofani-tty-e7b4f0bd784e93ac07dea4ba6a49eed08be5e325.tar.gz
Doubled expect timeout for connect in tests, removed libuuid from travis build
-rw-r--r--.travis.yml2
-rw-r--r--tests/functionaltests/proftest.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ade6084b..bf9ac29a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ install:
     - lsb_release -a
     - uname -a
     - sudo apt-get update
-    - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev libgpgme11-dev uuid-dev expect-dev tcl-dev
+    - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev libgpgme11-dev expect-dev tcl-dev
     - git clone git://github.com/boothj5/libmesode.git
     - cd libmesode
     - mkdir m4
diff --git a/tests/functionaltests/proftest.c b/tests/functionaltests/proftest.c
index b839ee48..efe46dc2 100644
--- a/tests/functionaltests/proftest.c
+++ b/tests/functionaltests/proftest.c
@@ -248,7 +248,7 @@ prof_connect_with_roster(char *roster)
     prof_input("password");
 
     // Allow time for profanity to connect
-    exp_timeout = 30;
+    exp_timeout = 60;
     assert_true(prof_output_regex("stabber@localhost logged in successfully, .+online.+ \\(priority 0\\)\\."));
     exp_timeout = 10;
     stbbr_wait_for("prof_presence_*");