libtransport.git Changeset - 2a40419b2bc4

Changeset - 2a40419b2bc4

Parent rev.

Child rev.

[Not reviewed]

0 5 2

Jan Kaluza - 14 years ago 2011-06-08 14:21:20
hanzz.k@gmail.com

Fixed crash in handleDisconnect handler

7 files changed with 71 insertions and 9 deletions:

backends/libircclient-qt/session.cpp

src/networkpluginserver.cpp

tests/CMakeLists.txt

tests/login/main.cpp

tests/login_bad_name/CMakeLists.txt

tests/login_bad_name/main.cpp

tests/runtests.py

0 comments (0 inline, 0 general)

backends/libircclient-qt/session.cpp

➞

Show inline comments

+{
 	this->np = np;
 	this->user = user;
 	connect(this, SIGNAL(disconnected()), SLOT(on_disconnected()));
+}
 void MyIrcSession::on_connected(){
@@ @@ -26,6 +27,7 @@ void MyIrcSession::on_connected(){ @@
 void MyIrcSession::on_disconnected()
+{
     std::cout << "disconnected:\n";
     np->handleDisconnected(user, "", 0, "");
+}
 void MyIrcSession::on_bufferAdded(Irc::Buffer* buffer)

src/networkpluginserver.cpp

➞

Show inline comments

+	}
 	m_component->m_userRegistry->onPasswordInvalid(payload.user());
 	user = m_userManager->getUser(payload.user());
 	if (!user) {
 		return;
+	}
 	user->handleDisconnected(payload.message());
+}

tests/CMakeLists.txt

➞

Show inline comments

 ADD_SUBDIRECTORY(login)
 ADD_SUBDIRECTORY(login_bad_name)
 add_custom_target(tests python runtests.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

tests/login/main.cpp

➞

Show inline comments

@@ @@ -10,12 +10,10 @@ using namespace boost; @@
 Client* client;
 static void handleDisconnected(const boost::optional<ClientError> &) {
 // 	std::cout << "Disconnected..." << std::endl;
 	exit(1);
+}
 static void handleConnected() {
 // 	std::cout << "Connected..." << std::endl;
 	exit(0);
+}

tests/login_bad_name/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(login_bad_name_test ${SRC})
 TARGET_LINK_LIBRARIES(login_bad_name_test transport ${SWIFTEN_LIBRARIES} -lgconf-2 -lgobject-2.0 -lglib-2.0)

tests/login_bad_name/main.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include <Swiften/Swiften.h>
 #include <Swiften/Client/ClientOptions.h>
 using namespace Swift;
 using namespace boost;
 Client* client;
 static void handleDisconnected(const boost::optional<ClientError> &error) {
 	exit(error->getType() != ClientError::AuthenticationFailedError);
+}
 static void handleConnected() {
 	exit(1);
+}
 static void handleMessageReceived(Message::ref message) {
 	// Echo back the incoming message
 	message->setTo(message->getFrom());
 	message->setFrom(JID());
 	client->sendMessage(message);
+}
 int main(int, char **argv) {
 	SimpleEventLoop eventLoop;
 	BoostNetworkFactories networkFactories(&eventLoop);
 	JID jid(JID(argv[1]).getNode() + "something", JID(argv[1]).getDomain());
 	client = new Client(jid, argv[2], &networkFactories);
 	client->setAlwaysTrustCertificates();
 	client->onConnected.connect(&handleConnected);
 	client->onDisconnected.connect(bind(&handleDisconnected, _1));
 	client->onMessageReceived.connect(bind(&handleMessageReceived, _1));
 	ClientOptions opt;
 	opt.allowPLAINOverNonTLS = true;
 	client->connect(opt);
 	eventLoop.run();
 	delete client;
 	return 0;
+}

tests/runtests.py

➞

Show inline comments

@@ @@ -3,7 +3,8 @@ import sys @@
 from subprocess import *
 import time
 def run_spectrum(backend):
 def run_spectrum(backend, test):
 	os.system("rm test.sql")
 	f = open("sample.cfg", "w")
 	f.write("\
 	[service]\n\
@@ @@ -21,13 +22,13 @@ def run_spectrum(backend): @@
 	" % (backend, backend)
+	)
 	f.close()
-	p = Popen("../spectrum/src/spectrum sample.cfg >> test.log 2> /dev/null", shell=True)
+	p = Popen("../spectrum/src/spectrum sample.cfg > " + backend + "_" + test + ".log 2>&1", shell=True)
 	time.sleep(2)
 	return p
 os.system("killall spectrum 2> /dev/null")
-os.system("rm test.log")
+os.system("rm *.log")
 for backend in os.listdir("../backends"):
 	if not os.path.isdir("../backends/" + backend) or backend == "CMakeFiles":
@@ @@ -38,7 +39,7 @@ for backend in os.listdir("../backends"): @@
 		if not os.path.exists(binary):
 			continue
-		p = run_spectrum(backend);
+		p = run_spectrum(backend, d)
 		if backend.find("purple") >= 0:
 			p = Popen(binary + " pyjim%jabber.cz@localhost test", shell=True)
@@ @@ -46,13 +47,18 @@ for backend in os.listdir("../backends"): @@
 		else:
 			p = Popen(binary + " testnickname%irc.freenode.net@localhost test", shell=True)
 		time.sleep(5)
 		seconds = 0
 		while p.poll() is None and seconds < 20:
 			time.sleep(1)
 			seconds += 1
 		p.poll()
 		if p.returncode == 0:
 			print "[ PASS ]", backend, binary
 		else:
 			print "[ FAIL ]", backend, binary
 			if seconds == 20:
 				print "[ TIME ]", backend, binary
 			else:
 				print "[ FAIL ]", backend, binary
 		os.system("killall spectrum 2> /dev/null")

0 comments (0 inline, 0 general)