Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-02-01 01:41:16 -05:00
parent 2a36ecbebf 149b744ba7
commit 27ccefbf0f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python_apps/pypo/pypofetch.py
View File

@ -136,7 +136,7 @@ class PypoFetch(Thread):
try: try:
lock.acquire() lock.acquire()
tn = telnetlib.Telnet(LS_HOST, LS_PORT) tn = telnetlib.Telnet(LS_HOST, LS_PORT)
self.logger.info(command) logger.info(command)
tn.write(command) tn.write(command)
tn.write('exit\n') tn.write('exit\n')
tn.read_all() tn.read_all()

3
python_apps/pypo/tests/test_modify_cue_in.py
View File

@ -10,7 +10,6 @@ telnet_lock = Lock()
pp = PypoPush(pypoPush_q, telnet_lock) pp = PypoPush(pypoPush_q, telnet_lock)
def test_modify_cue_in(): def test_modify_cue_in():
link = pp.modify_first_link_cue_point([]) link = pp.modify_first_link_cue_point([])
assert len(link) == 0 assert len(link) == 0
@ -25,5 +24,3 @@ def test_modify_cue_in():
link = pp.modify_first_link_cue_point(link) link = pp.modify_first_link_cue_point(link)
assert len(link) == 1 assert len(link) == 1