Partially working with new msnw

[pymsnt] / src / tlib / msn / test_msnw.py

diff --git a/src/tlib/msn/test_msnw.py b/src/tlib/msn/test_msnw.py
index e039f9caa3a5b82d095cf4283773a1511e4dba5b..feb78203ea0c656172cac8778923ac4756637663 100644 (file)
--- a/src/tlib/msn/test_msnw.py
+++ b/src/tlib/msn/test_msnw.py
@@ -49,7 +49,7 @@ def clearAccount(msncon):
                        d.callback(None)
 
        for msnContact in msncon.getContacts().contacts.values():
-               for list in [msnw.FORWARD_LIST, msnw.BLOCK_LIST, msnw.ALLOW_LIST, msnw.PENDING_LIST]:
+               for list in [msn.FORWARD_LIST, msn.BLOCK_LIST, msn.ALLOW_LIST, msn.PENDING_LIST]:
                        if msnContact.lists & list:
                                msncon.remContact(list, msnContact.userHandle).addCallback(cb)
                                count += 1
@@ -116,14 +116,14 @@ class TestsUtil:
 
        def doAddContacts(self, both=True):
                # Adding users to each other's lists
-               self.user1.addContact(msnw.FORWARD_LIST, USER2).addCallback(self.cb)
+               self.user1.addContact(msn.FORWARD_LIST, USER2).addCallback(self.cb)
                self.loop("Adding user2 to user1's forward list.")
-               self.user1.addContact(msnw.ALLOW_LIST, USER2).addCallback(self.cb)
+               self.user1.addContact(msn.ALLOW_LIST, USER2).addCallback(self.cb)
                self.loop("Adding user2 to user1's allow list.")
                if both:
-                       self.user2.addContact(msnw.FORWARD_LIST, USER1).addCallback(self.cb)
+                       self.user2.addContact(msn.FORWARD_LIST, USER1).addCallback(self.cb)
                        self.loop("Adding user1 to user2's forward list.")
-                       self.user2.addContact(msnw.ALLOW_LIST, USER1).addCallback(self.cb)
+                       self.user2.addContact(msn.ALLOW_LIST, USER1).addCallback(self.cb)
                        self.loop("Adding user1 to user2's allow list.")
 
                        # Check the contacts have seen each other
@@ -212,7 +212,7 @@ class BasicTests(unittest.TestCase, TestsUtil):
                d = self.user1.sendFile(USER2, "myfile.txt", len(data))
                d.addCallback(gotFileSend)
                self.loop("Sending file.", cond="GOTMESSAGE", timeout=60*60)
-#      testFileSend.skip = "True"
+       testFileSend.skip = "True"
 
        def testFileReceive(self):
                if raw_input("\n\nALERT!!!\n\nPlease connect to account %s and send a file transfer to %s.\nType ok when you are ready: " % (USER2, USER1)).lower() != "ok":
@@ -241,5 +241,5 @@ class BasicTests(unittest.TestCase, TestsUtil):
                self.doPurgeContacts(both=False)
                self.doAddContacts(both=False)
                self.loop("Receiving file.", cond="GOTFILE", timeout=60*60)
-#      testFileReceive.skip = "True"
+       testFileReceive.skip = "True"