aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into plugins

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
James Booth 2015-10-13 00:50:26 +01:00
commit 008c40d1c1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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 autoconf-archive 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 autoconf-archive expect-dev tcl-dev
- sudo apt-get -y install libtool python-dev lua5.2 liblua5.2-dev ruby-dev
- git clone git://github.com/boothj5/libmesode.git
- cd libmesode

2
tests/functionaltests/proftest.c
View File

@ -244,7 +244,7 @@ prof_connect_with_roster(char *roster)
"</presence>"
);
prof_input("/connect stabber@localhost port 5230");
prof_input("/connect stabber@localhost server 127.0.0.1 port 5230");
prof_input("password");
// Allow time for profanity to connect

2
tests/functionaltests/test_connect.c
View File

@ -50,7 +50,7 @@ connect_jid_requests_bookmarks(void **state)
void
connect_bad_password(void **state)
{
prof_input("/connect stabber@localhost port 5230");
prof_input("/connect stabber@localhost server 127.0.0.1 port 5230");
prof_input("badpassword");
assert_true(prof_output_exact("Login failed."));