summaryrefslogtreecommitdiff
path: root/conn_tests
diff options
context:
space:
mode:
authorBrian Beggs <macdiesel@speakeasy.net>2010-05-14 10:59:41 -0400
committerBrian Beggs <macdiesel@speakeasy.net>2010-05-14 10:59:41 -0400
commit4b322720b39731d16fefedd8a77b3f9bb1684d7e (patch)
tree330e3a05f35675b0779060656156cefe320e27f2 /conn_tests
parent1521a8b5c9d656ef80a4caf3d7daa86f8f504423 (diff)
parent7522839141e7dd5bd081a421a58b0962b705fdda (diff)
downloadslixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.gz
slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.bz2
slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.xz
slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.zip
Merge remote branch 'tom/master'
Diffstat (limited to 'conn_tests')
-rw-r--r--conn_tests/test_pubsubserver.py37
1 files changed, 37 insertions, 0 deletions
diff --git a/conn_tests/test_pubsubserver.py b/conn_tests/test_pubsubserver.py
index 7e5b57b0..d1e2208f 100644
--- a/conn_tests/test_pubsubserver.py
+++ b/conn_tests/test_pubsubserver.py
@@ -43,6 +43,10 @@ class TestPubsubServer(unittest.TestCase):
def test001getdefaultconfig(self):
"""Get the default node config"""
+ self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode2')
+ self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode3')
+ self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode4')
+ self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode5')
result = self.xmpp1['xep_0060'].getNodeConfig(self.pshost)
self.statev['defaultconfig'] = result
self.failUnless(isinstance(result, sleekxmpp.plugins.xep_0004.Form))
@@ -130,6 +134,39 @@ class TestPubsubServer(unittest.TestCase):
self.failUnless(msg != False, "Account #1 did not get message event: perhaps node was advertised incorrectly?")
self.failUnless(result)
+# def test016speedtest(self):
+# "Uncached speed test"
+# import time
+# start = time.time()
+# for y in range(0, 50000, 1000):
+# start2 = time.time()
+# for x in range(y, y+1000):
+# self.failUnless(self.xmpp1['xep_0060'].subscribe(self.pshost, "testnode4", subscribee="testuser%s@whatever" % x))
+# print time.time() - start2
+# seconds = time.time() - start
+# print "--", seconds
+# print "---------"
+# time.sleep(15)
+# self.failUnless(self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode4'), "Could not delete non-cached test node")
+
+# def test015speedtest(self):
+# "cached speed test"
+# result = self.xmpp1['xep_0060'].getNodeConfig(self.pshost)
+# self.statev['defaultconfig'] = result
+# self.statev['defaultconfig'].field['pubsub#node_type'].setValue("leaf")
+# self.statev['defaultconfig'].field['sleek#saveonchange'].setValue(True)
+# self.failUnless(self.xmpp1['xep_0060'].create_node(self.pshost, 'testnode4', self.statev['defaultconfig']))
+# self.statev['defaultconfig'].field['sleek#saveonchange'].setValue(False)
+# self.failUnless(self.xmpp1['xep_0060'].create_node(self.pshost, 'testnode5', self.statev['defaultconfig']))
+# start = time.time()
+# for y in range(0, 50000, 1000):
+# start2 = time.time()
+# for x in range(y, y+1000):
+# self.failUnless(self.xmpp1['xep_0060'].subscribe(self.pshost, "testnode5", subscribee="testuser%s@whatever" % x))
+# print time.time() - start2
+# seconds = time.time() - start
+# print "--", seconds
+
def test900cleanup(self):
"Cleaning up"
self.failUnless(self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode2'), "Could not delete test node.")