Skip to content

Commit

Permalink
fixed error in error message
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyades
hyades committed Sep 1, 2013
1 parent 0273d41 commit b6a254c
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions python-api/tests/integrationtests/test_controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def test_establish(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -50,7 +50,7 @@ def test_establish(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)


Expand Down Expand Up @@ -89,9 +89,9 @@ def test_compose_ports(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -100,7 +100,7 @@ def test_compose_ports(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)

at = [ tuple(i) for i in expected_result]
Expand Down Expand Up @@ -142,9 +142,9 @@ def test_encode_ports(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -153,7 +153,7 @@ def test_encode_ports(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)

at = [ tuple(i) for i in expected_result]
Expand Down Expand Up @@ -198,9 +198,9 @@ def test_audio_ports(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -209,7 +209,7 @@ def test_audio_ports(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)
# print res
# print expected_result
Expand Down Expand Up @@ -256,9 +256,9 @@ def test_audio_ports(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -267,7 +267,7 @@ def test_audio_ports(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)

at = [ tuple(i) for i in expected_result]
Expand Down Expand Up @@ -312,9 +312,9 @@ def test_get_preview_ports(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -323,7 +323,7 @@ def test_get_preview_ports(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)


Expand Down Expand Up @@ -393,9 +393,9 @@ def set_composite_mode(self, mode, generate_frames=False):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -404,7 +404,7 @@ def set_composite_mode(self, mode, generate_frames=False):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)
pass

Expand Down Expand Up @@ -464,9 +464,9 @@ def test_new_record(self):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -475,7 +475,7 @@ def test_new_record(self):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)


Expand Down Expand Up @@ -516,9 +516,9 @@ def adjust_pip(self, dx, dy, dw, dh, index, generate_frames=False):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -527,7 +527,7 @@ def adjust_pip(self, dx, dy, dw, dh, index, generate_frames=False):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)

def verify_output(self, index, video):
Expand Down Expand Up @@ -580,9 +580,9 @@ def switch(self, channel, port, index, generate_frames=False):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand Down Expand Up @@ -641,9 +641,9 @@ def click_video(self, dx, dy, dw, dh, index, generate_frames=False):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -652,7 +652,7 @@ def click_video(self, dx, dy, dw, dh, index, generate_frames=False):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)

def verify_output(self, index, video):
Expand Down Expand Up @@ -711,9 +711,9 @@ def mark_face(self, faces, index, generate_frames=False):
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
if ob.message:
try:
error_msg = ob.message
else:
except Exception:
error_msg = ''
custom_error = """
{0}
Expand All @@ -722,7 +722,7 @@ def mark_face(self, faces, index, generate_frames=False):
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.kill()
s.terminate()
raise ob.__class__(custom_error)

def verify_output(self, index, video):
Expand Down

0 comments on commit b6a254c

Please sign in to comment.