nikdoof/python-ts3
1
0
Fork 0
mirror of https://github.com/nikdoof/python-ts3.git synced 2025-12-17 11:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

a fix and new tests for parse_data

Browse Source
This commit is contained in:
Krzysztof Jagiello
2011-06-06 16:36:53 +02:00
committed by Andrew Williams
parent 762f1dd0d1
commit 9ac1fd1d8d
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ts3/__init__.py
View File

@@ -214,7 +214,7 @@ class TS3Proto():
if len(chunk) > 1: if len(chunk) > 1:
if len(chunk) > 2: if len(chunk) > 2:
# value can contain '=' which may confuse our parser # value can contain '=' which may confuse our parser
chunk = [v[0], '='.join(v[1:])] chunk = [chunk[0], '='.join(chunk[1:])]
key, value = chunk key, value = chunk
parsed_data[key] = TS3Proto._unescape_str(value) parsed_data[key] = TS3Proto._unescape_str(value)

27
ts3/test.py
View File

@@ -14,28 +14,28 @@ class TS3ProtoTest(unittest.TestCase):
expected = r'\p\/\sabcdefg\p\s\p' expected = r'\p\/\sabcdefg\p\s\p'
res = self.ts3._escape_str(teststr) res = self.ts3._escape_str(teststr)
self.assertTrue(res, expected) self.assertEqual(res, expected)
def testControlEscaping(self): def testControlEscaping(self):
teststr = "\n\r\t" teststr = "\n\r\t"
expected = r'\n\r\t' expected = r'\n\r\t'
self.assertTrue(self.ts3._escape_str(teststr), expected) self.assertEqual(self.ts3._escape_str(teststr), expected)
def testCharacterUnEscaping(self): def testCharacterUnEscaping(self):
teststr = r'\p\/\sabcdefg\p\s\p' teststr = r'\p\/\sabcdefg\p\s\p'
expected = '|/ abcdefg| |' expected = '|/ abcdefg| |'
self.assertTrue(self.ts3._unescape_str(teststr), expected) self.assertEqual(self.ts3._unescape_str(teststr), expected)
def testFullCircle(self): def testFullCircle(self):
teststr = '|/ abcdefg| |' teststr = '|/ abcdefg| |'
res = self.ts3._unescape_str(self.ts3._escape_str(teststr)) res = self.ts3._unescape_str(self.ts3._escape_str(teststr))
self.assertTrue(res, teststr) self.assertEqual(res, teststr)
def testConstructBasic(self): def testConstructBasic(self):
self.assertEqual(self.ts3.construct_command('testcommand'), 'testcommand') self.assertEqual(self.ts3.construct_command('testcommand'), 'testcommand')
@@ -46,6 +46,25 @@ class TS3ProtoTest(unittest.TestCase):
self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': [1, 2, 3]}), 'testcommand key2=1|key2=2|key2=3 key1=test') self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': [1, 2, 3]}), 'testcommand key2=1|key2=2|key2=3 key1=test')
self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': 'test'}, opts=['test']), 'testcommand key2=test key1=test -test') self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': 'test'}, opts=['test']), 'testcommand key2=test key1=test -test')
def testParseData(self):
# some response examples taken from http://media.teamspeak.com/ts3_literature/TeamSpeak%203%20Server%20Query%20Manual.pdf
data = 'timestamp=1259356318 level=4 channel=Query msg=query\sfrom\s87.163.52.195:9\sissued:\slogview\slimitcount=30|timestamp=1259356148'
parsed = [{'msg': 'query from 87.163.52.195:9 issued: logview limitcount=30', 'timestamp': '1259356318', 'channel': 'Query', 'level': '4'}, {'timestamp': '1259356148'}]
self.assertEqual(self.ts3.parse_data(data), parsed)
data = 'cid=2 cldbid=9 cgid=9|cid=2 cldbid=24 cgid=9|cid=2 cldbid=47 cgid=9'
parsed = [{'cgid': '9', 'cldbid': '9', 'cid': '2'}, {'cgid': '9', 'cldbid': '24', 'cid': '2'}, {'cgid': '9', 'cldbid': '47', 'cid': '2'}]
self.assertEqual(self.ts3.parse_data(data), parsed)
data = 'client_unique_identifier=P5H2hrN6+gpQI4n\/dXp3p17vtY0= client_nickname=Rabe85 client_version=3.0.0-alpha24\s[Build:\s8785]\s(UI:\s8785)'
parsed = {'client_unique_identifier': 'P5H2hrN6+gpQI4n/dXp3p17vtY0=', 'client_version': '3.0.0-alpha24 [Build: 8785] (UI: 8785)', 'client_nickname': 'Rabe85'}
self.assertEqual(self.ts3.parse_data(data), parsed)
def suite(): def suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TS3ProtoTest)) suite.addTest(unittest.makeSuite(TS3ProtoTest))