From d9386f7542082cc3e5c9ff1a6203e23858040314 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Tue, 14 Jan 2014 18:05:45 +0100
Subject: [PATCH] validate: tools: Cleanup the way we return code in position
 query

---
 validate/tools/launcher/utils.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/validate/tools/launcher/utils.py b/validate/tools/launcher/utils.py
index d114e3f93c..a663ce0373 100644
--- a/validate/tools/launcher/utils.py
+++ b/validate/tools/launcher/utils.py
@@ -20,6 +20,7 @@
 
 import os
 import urllib
+import loggable
 import urlparse
 import subprocess
 
@@ -204,7 +205,7 @@ def _parse_position(p):
 
 
 def _get_position(test):
-    position = duration = 0
+    position = duration = -1
 
     test.reporter.out.seek(0)
     m = None
@@ -215,6 +216,7 @@ def _get_position(test):
             break
 
     if m is None:
+        loggable.debug("utils", "Could not fine any positionning info")
         return position, duration
 
     for j in m.split("\r"):
@@ -228,7 +230,8 @@ def get_current_position(test, max_passed_stop=0.5):
     position, duration = _get_position(test)
 
     if position > duration + max_passed_stop:
-        return 0
+        loggable.warning("utils", "Position > duration -> Returning -1")
+        return -1
 
     return position
 
@@ -236,13 +239,17 @@ def get_current_position(test, max_passed_stop=0.5):
 def get_current_size(test):
     position = get_current_position(test)
 
-    if position is Result.FAILED:
-        return position
+    if position is -1:
+        return -1
+
+    size = os.stat(urlparse.urlparse(test.dest_file).path).st_size
+    loggable.debug("utils", "Size: %s" % size)
+    return size
 
-    return os.stat(urlparse.urlparse(test.dest_file).path).st_size
 
 def get_duration(media_file):
     duration = 0
+
     def parse_gsttimeargs(time):
         stime = time.split(":")
         sns = stime[2].split(".")
@@ -262,6 +269,7 @@ def get_duration(media_file):
 
     return duration
 
+
 def compare_rendered_with_original(orig_duration, dest_file, tolerance=DURATION_TOLERANCE):
         duration = get_duration(dest_file)