27 Commits

Author	SHA1	Message	Date
James Booth	e9d7693856	Merge branch 'master' into osx-functional	2015-07-23 00:46:17 +01:00
James Booth	decd5066ce	tests: prof_connect_with_roster takes items	2015-07-23 00:40:08 +01:00
James Booth	b583290907	Merge branch 'master' into osx-functional	2015-07-22 22:55:39 +01:00
James Booth	f9a7e35001	Added id attributes to roster queries ... fixes #596	2015-07-22 22:48:37 +01:00
James Booth	b11fd81b0d	Merge branch 'master' into osx-functional ... Conflicts: tests/functionaltests/functionaltests.c	2015-07-20 22:36:34 +01:00
James Booth	d40998c4af	Added reciept send functional test	2015-07-20 22:35:14 +01:00
James Booth	d54cbf126a	Added receipt request functional test	2015-07-20 22:21:29 +01:00
James Booth	d3130be8a5	Merge branch 'master' into osx-functional ... Conflicts: tests/functionaltests/functionaltests.c	2015-07-20 22:03:58 +01:00
James Booth	52e2917b5d	Added functional test macro	2015-07-20 22:00:51 +01:00
James Booth	232e746637	Merge branch 'master' into osx-functional ... Conflicts: tests/functionaltests/functionaltests.c	2015-07-20 21:46:31 +01:00
James Booth	bdcc0ddbf8	Added carbon message tests	2015-07-20 21:36:58 +01:00
James Booth	ba50414ac2	Debugging expect test	2015-07-16 23:53:26 +01:00
James Booth	4027968b4c	Merge branch 'master' into osx-functional	2015-07-15 00:24:44 +01:00
James Booth	f3326bf105	Added carbons enable/disable tests	2015-07-15 00:23:46 +01:00
James Booth	50ac166cff	Reverted previous attempt to get expect working on osx	2015-07-14 23:36:39 +01:00
James Booth	0400a5237f	WIP getting functional tests working on osx	2015-07-13 20:06:48 +01:00
James Booth	5e324e407f	Added carbons command functional test	2015-07-05 17:29:33 +01:00
James Booth	e50461a897	Set columns when running functional tests	2015-06-13 23:59:33 +01:00
James Booth	82ff85c329	Revert back to original rooms test	2015-06-13 22:13:01 +01:00
James Booth	dda79aed24	Debugging travis build	2015-06-13 21:31:38 +01:00
James Booth	5b58e2d0bc	Debugging travis build	2015-06-13 21:20:13 +01:00
James Booth	5c13f00e2f	Debugging travis build	2015-06-13 21:13:21 +01:00
James Booth	0fcfa65f15	Use regex for multiline assert in rooms functional test	2015-06-13 20:53:51 +01:00
James Booth	0c3fe51799	Changed assert order in rooms test	2015-06-13 20:10:12 +01:00
James Booth	6255420b80	Increase connection time, functional tests	2015-06-13 19:49:26 +01:00
James Booth	a48b9fcec2	Tidied functional tests	2015-06-13 19:41:11 +01:00
James Booth	68ed20f10d	Moved all tests to tests folder	2015-06-12 23:53:30 +01:00