Changes in Client() initialization, changes in test suite (only one

connection is used now to speed stuff up)

diff --git a/diaspy/client.py b/diaspy/client.py
index 4e2cc0dc75032b9107f803d649bfe3cfd413bbd9..64a8ddc10b4d10e4ab50d99ed404eef02493f739 100644 (file)
--- a/diaspy/client.py
+++ b/diaspy/client.py
@@ -6,18 +6,25 @@ import diaspy.connection
 class Client:
     """This is the client class to connect to Diaspora.
     """
-    def __init__(self, pod, username, password):
+    def __init__(self, pod, username='', password=''):
         """
-        :param pod: The complete url of the diaspora pod to use.
+        `pod` can also be a diaspy.connection.Connection type and
+        Client() will detect it. When giving a connection there is no need 
+        to pass username and password.
+
+        :param pod: The complete url of the diaspora pod to use
+        (or Connection() object).
         :type pod: str
         :param username: The username used to log in.
         :type username: str
         :param password: The password used to log in.
         :type password: str
         """
-        self.connection = diaspy.connection.Connection(pod, username, password)
-        self.connection.login()
-        self.pod = pod
+        if type(pod) == diaspy.connection.Connection:
+            self.connection = pod
+        else:
+            self.connection = diaspy.connection.Connection(pod, username, password)
+            self.connection.login()
         self.stream = diaspy.streams.Stream(self.connection, 'stream.json')
 
     def post(self, text, aspect_ids='public', photos=None):

diff --git a/test.sh b/test.sh
deleted file mode 100755 (executable)
index 9152bc8..0000000
--- a/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-python -m unittest --verbose --catch --failfast tests.py

diff --git a/tests.py b/tests.py
index 549e6c3c0e8efd5696223a9c33c35c5f9d1e8d9b..548592550b8a911eda2a303ad9b9fd7c90c283d5 100644 (file)
--- a/tests.py
+++ b/tests.py
@@ -32,22 +32,19 @@ test_count_file.write(str(test_count))
 test_count_file.close()
 print('Running test no. {0}'.format(test_count))
 
-print('Running tests on connection to pod: "{0}"\n'.format(__pod__))
+print('Running tests on connection to pod: "{0}"\t'.format(__pod__), end='')
 test_connection = diaspy.connection.Connection(pod=__pod__, username=__username__, password=__passwd__)
 test_connection.login()
+print('[ CONNECTED ]\n')
 
 
 #### Test suite code
 class StreamTest(unittest.TestCase):
     def testGetting(self):
-        c = diaspy.connection.Connection(pod=__pod__, username=__username__, password=__passwd__)
-        c.login()
-        stream = diaspy.streams.Generic(c)
+        stream = diaspy.streams.Generic(test_connection)
 
     def testGettingLength(self):
-        c = diaspy.connection.Connection(pod=__pod__, username=__username__, password=__passwd__)
-        c.login()
-        stream = diaspy.streams.Generic(c)
+        stream = diaspy.streams.Generic(test_connection)
         len(stream)
 
     def testClearing(self):
@@ -64,16 +61,12 @@ class StreamTest(unittest.TestCase):
         self.assertNotIn(post.post_id, [p.post_id for p in stream])
 
     def testPostingText(self):
-        c = diaspy.connection.Connection(pod=__pod__, username=__username__, password=__passwd__)
-        c.login()
-        stream = diaspy.streams.Stream(c)
+        stream = diaspy.streams.Stream(test_connection)
         post = stream.post('#diaspy test no. {0}'.format(test_count))
         self.assertEqual(diaspy.models.Post, type(post))
 
     def testPostingImage(self):
-        c = diaspy.connection.Connection(pod=__pod__, username=__username__, password=__passwd__)
-        c.login()
-        stream = diaspy.streams.Stream(c)
+        stream = diaspy.streams.Stream(test_connection)
         stream.post_picture('./test-image.png')
 
 
@@ -87,38 +80,36 @@ class ConnectionTest(unittest.TestCase):
         self.assertRaises(diaspy.connection.LoginError, connection.login, username='user')
 
     def testGettingUserInfo(self):
-        connection = diaspy.connection.Connection(__pod__, __username__, __passwd__)
-        connection.login()
-        info = connection.getUserInfo()
+        info = test_connection.getUserInfo()
         self.assertEqual(dict, type(info))
 
 
 class ClientTests(unittest.TestCase):
     def testGettingStream(self):
-        client = diaspy.client.Client(__pod__, __username__, __passwd__)
+        client = diaspy.client.Client(test_connection)
         stream = client.get_stream()
         if len(stream): self.assertEqual(diaspy.models.Post, type(stream[0]))
 
     def testGettingNotifications(self):
-        client = diaspy.client.Client(__pod__, __username__, __passwd__)
+        client = diaspy.client.Client(test_connection)
         notifications = client.get_notifications()
         self.assertEqual(list, type(notifications))
         if notifications: self.assertEqual(dict, type(notifications[0]))
 
     def testGettingTagAsList(self):
-        client = diaspy.client.Client(pod=__pod__, username=__username__, password=__passwd__)
+        client = diaspy.client.Client(test_connection)
         tag = client.get_tag('foo')
         self.assertEqual(list, type(tag))
         if tag: self.assertEqual(diaspy.models.Post, type(tag[0]))
 
     def testGettingTagAsStream(self):
-        client = diaspy.client.Client(pod=__pod__, username=__username__, password=__passwd__)
+        client = diaspy.client.Client(test_connection)
         tag = client.get_tag('foo', stream=True)
         self.assertEqual(diaspy.streams.Generic, type(tag))
         if tag: self.assertEqual(diaspy.models.Post, type(tag[0]))
 
     def testGettingMailbox(self):
-        client = diaspy.client.Client(pod=__pod__, username=__username__, password=__passwd__)
+        client = diaspy.client.Client(test_connection)
         mailbox = client.get_mailbox()
         self.assertEqual(list, type(mailbox))
         self.assertEqual(diaspy.conversations.Conversation, type(mailbox[0]))