summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpranomostro <pranomestro@gmail.com>2016-12-15 17:43:49 +0100
committerpranomostro <pranomestro@gmail.com>2016-12-15 17:43:49 +0100
commitc21933644001ec721d602490a3a6392b73cba592 (patch)
treef284aeb3c9e96feeb03dd70af6781e5dab89b30f
parentc38aca268244d3c7004d6987a63d5756df148209 (diff)
Make tests faster by not starting three different sessions after each other.
-rw-r--r--Makefile2
-rwxr-xr-xtests/test-file9
-rwxr-xr-xtests/test-ratox (renamed from tests/test-chat)1
-rwxr-xr-xtests/test-request8
4 files changed, 2 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index ffd8af2..feb140f 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,6 @@ clean:
check: all
@echo testing
- @cd tests; sh test-chat && sh test-file && sh test-request
+ @cd tests; sh test-ratox
.PHONY: all binlib bin install uninstall clean check
diff --git a/tests/test-file b/tests/test-file
deleted file mode 100755
index 2499aa6..0000000
--- a/tests/test-file
+++ /dev/null
@@ -1,9 +0,0 @@
-. ./common
-
-spawn_users
-add_friends
-send_file
-echo :: $(basename $0) - $(echolor 2 OK)
-
-cleanup
-exit 0
diff --git a/tests/test-chat b/tests/test-ratox
index 97bc838..89b7ce1 100755
--- a/tests/test-chat
+++ b/tests/test-ratox
@@ -3,6 +3,7 @@
spawn_users
add_friends
send_text
+send_file
echo :: $(basename $0) - $(echolor 2 OK)
cleanup
diff --git a/tests/test-request b/tests/test-request
deleted file mode 100755
index 63b9312..0000000
--- a/tests/test-request
+++ /dev/null
@@ -1,8 +0,0 @@
-. ./common
-
-spawn_users
-add_friends
-echo :: $(basename $0) - $(echolor 2 OK)
-
-cleanup
-exit 0