Check bit shifting

build/android/test_wrapper/logdog_wrapper.py

Index: build/android/test_wrapper/logdog_wrapper.py
diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_wrapper/logdog_wrapper.py
index 6daea499d4341a039b92aad50467317d6d7ed6fd..a339bdb305507bcf9f6d4b32eff385c95b111d73 100755
--- a/build/android/test_wrapper/logdog_wrapper.py
+++ b/build/android/test_wrapper/logdog_wrapper.py
@@ -46,18 +46,25 @@ def main():
   if not test_cmd:
     parser.error('Must specify command to run after the logdog flags')
   result = subprocess.call(test_cmd)
-  if '${SWARMING_TASK_ID}' in args.prefix:
-    args.prefix = args.prefix.replace('${SWARMING_TASK_ID}',
-                                      os.environ.get('SWARMING_TASK_ID'))
-  url = CreateUrl('luci-logdog.appspot.com', args.project, args.prefix,
-                  args.name)
-  logdog_cmd = [args.logdog_bin_cmd, '-project', args.project,
-                '-output', 'logdog,host=%s' % args.logdog_server,
-                '-prefix', args.prefix,
-                '-service-account-json', args.service_account_json,
-                'stream', '-source', args.source,
-                '-stream', '-name=%s' % args.name]
+  # Only excute logdog tasks if binary is downloaded
   if os.path.exists(args.logdog_bin_cmd):
+    if '${SWARMING_TASK_ID}' in args.prefix:
+      swarming_id  = os.environ.get('SWARMING_TASK_ID')
+      print type(swarming_id)
+      print sys.getsizeof(swarming_id)
+      print swarming_id
+      # Subtract swarming_id by 1 to match display in recipes
+      swarmingId = format(int(swarming_id, 16) - 1, 'x')
+      print swarming_id
+      args.prefix = args.prefix.replace('${SWARMING_TASK_ID}', swarmingId)
+    url = CreateUrl('luci-logdog.appspot.com', args.project, args.prefix,
+                    args.name)
+    logdog_cmd = [args.logdog_bin_cmd, '-project', args.project,
+                  '-output', 'logdog,host=%s' % args.logdog_server,
+                  '-prefix', args.prefix,
+                  '-service-account-json', args.service_account_json,
+                  'stream', '-source', args.source,
+                  '-stream', '-name=%s' % args.name]
     subprocess.call(logdog_cmd)
     logging.info('Logcats are located at: %s', url)
   return result