From 2f8c1954f0be9594720eb7637188290cefaaec7d Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Tue, 11 May 2010 12:20:57 -0700 Subject: use pubsub settings --- conn_tests/test_pubsubserver.py | 4 ++-- conn_tests/testconfig.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'conn_tests') diff --git a/conn_tests/test_pubsubserver.py b/conn_tests/test_pubsubserver.py index 9fd3bd8f..c9ff900e 100644 --- a/conn_tests/test_pubsubserver.py +++ b/conn_tests/test_pubsubserver.py @@ -65,7 +65,7 @@ class TestPubsubServer(unittest.TestCase): """Retrieving node config and reconfiguring""" nconfig = self.xmpp1['xep_0060'].getNodeConfig(self.pshost, 'testnode2') self.failUnless(nconfig, "No configuration returned") - #print("%s == %s" % (nconfig.getValues(), self.statev['defaultconfig'].getValues())) + #print("\n%s ==\n %s" % (nconfig.getValues(), self.statev['defaultconfig'].getValues())) self.failUnless(nconfig.getValues() == self.statev['defaultconfig'].getValues(), "Configuration does not match") self.failUnless(self.xmpp1['xep_0060'].setNodeConfig(self.pshost, 'testnode2', nconfig)) @@ -168,7 +168,7 @@ if __name__ == '__main__': TestPubsubServer.xmpp1 = xmpp1 TestPubsubServer.xmpp2 = xmpp2 - TestPubsubServer.pshost = 'pubsub.recon' + TestPubsubServer.pshost = config.get('settings', 'pubsub') xmpp1.waitforstart.get(True) xmpp2.waitforstart.get(True) testsuite = unittest.TestLoader().loadTestsFromTestCase(TestPubsubServer) diff --git a/conn_tests/testconfig.ini b/conn_tests/testconfig.ini index 91f97a92..fc57bd17 100644 --- a/conn_tests/testconfig.ini +++ b/conn_tests/testconfig.ini @@ -1,5 +1,6 @@ [settings] enabled=true +pubsub=pubsub.recon [account1] jid=fritzy@recon -- cgit v1.2.3