Skip to content

Commit

Permalink
modified errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyades
hyades committed Sep 1, 2013
1 parent bce22b6 commit fa6b9fe
Show file tree
Hide file tree
Showing 2 changed files with 124 additions and 164 deletions.
255 changes: 109 additions & 146 deletions python-api/tests/integrationtests/test_controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,20 @@ def test_establish(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)

{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)



class TestGetComposePort(object):
Expand Down Expand Up @@ -86,22 +83,19 @@ def test_compose_ports(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

at = [ tuple(i) for i in expected_result]
bt = [ tuple(i) for i in res]
Expand Down Expand Up @@ -139,22 +133,19 @@ def test_encode_ports(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

at = [ tuple(i) for i in expected_result]
bt = [ tuple(i) for i in res]
Expand Down Expand Up @@ -195,22 +186,19 @@ def test_audio_ports(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)
# print res
# print expected_result
at = [ tuple(i) for i in expected_result]
Expand Down Expand Up @@ -253,22 +241,19 @@ def test_audio_ports(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

at = [ tuple(i) for i in expected_result]
bt = [ tuple(i) for i in res]
Expand Down Expand Up @@ -309,22 +294,19 @@ def test_get_preview_ports(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)


class VideoFileSink(object):
Expand Down Expand Up @@ -390,23 +372,19 @@ def set_composite_mode(self, mode, generate_frames=False):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
pass
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

def verify_output(self, mode, video):
test = 'composite_mode_{0}'.format(mode)
Expand Down Expand Up @@ -461,22 +439,19 @@ def test_new_record(self):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)


class TestAdjustPIP(object):
Expand Down Expand Up @@ -513,22 +488,19 @@ def adjust_pip(self, dx, dy, dw, dh, index, generate_frames=False):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

def verify_output(self, index, video):
test = 'adjust_pip_{0}'.format(index)
Expand Down Expand Up @@ -577,22 +549,19 @@ def switch(self, channel, port, index, generate_frames=False):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

def test_switch(self):
d = [
Expand Down Expand Up @@ -638,22 +607,19 @@ def click_video(self, dx, dy, dw, dh, index, generate_frames=False):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

def verify_output(self, index, video):
test = 'click_video_{0}'.format(index)
Expand Down Expand Up @@ -708,22 +674,19 @@ def mark_face(self, faces, index, generate_frames=False):
finally:
if s.proc:
poll = s.proc.poll()
s.terminate()
if poll < 0:
error_type, ob, tb = sys.exc_info()
server_log = open('server.log').read()
try:
error_msg = ob.message
except Exception:
error_msg = ''
error_msg = ob.message
custom_error = """
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
s.terminate()
raise ob.__class__(custom_error)
{0}
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
gst-switch-srv log:
Error Code - {1} (http://tldp.org/LDP/abs/html/exitcodes.html)
{2}
""".format(error_msg, abs(poll), server_log)
raise ob.__class__(custom_error)

def verify_output(self, index, video):
test = 'mark_face_{0}'.format(index)
Expand Down
Loading

0 comments on commit fa6b9fe

Please sign in to comment.