From 02fd39dbe65a5b3f00a19d2e682145670db0ddf1 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 5 Jun 2012 17:57:12 +0000
Subject: Make executable scripts executable.

Improve the unit test to get the file size at runtime.

NOTRY=true
R=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10515019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140557 0039d316-1c4b-4281-b951-d872f2087c98
---
 tools/isolate/data/trace_inputs/child1.py |  1 +
 tools/isolate/data/trace_inputs/child2.py |  1 +
 tools/isolate/trace_inputs_smoke_test.py  | 20 +++++++++-----------
 3 files changed, 11 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 tools/isolate/data/trace_inputs/child1.py
 mode change 100644 => 100755 tools/isolate/data/trace_inputs/child2.py

(limited to 'tools')

diff --git a/tools/isolate/data/trace_inputs/child1.py b/tools/isolate/data/trace_inputs/child1.py
old mode 100644
new mode 100755
index 9155867..d6fc70d
--- a/tools/isolate/data/trace_inputs/child1.py
+++ b/tools/isolate/data/trace_inputs/child1.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/tools/isolate/data/trace_inputs/child2.py b/tools/isolate/data/trace_inputs/child2.py
old mode 100644
new mode 100755
index 6b18364..749e341
--- a/tools/isolate/data/trace_inputs/child2.py
+++ b/tools/isolate/data/trace_inputs/child2.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/tools/isolate/trace_inputs_smoke_test.py b/tools/isolate/trace_inputs_smoke_test.py
index 75b7965..bd67455 100755
--- a/tools/isolate/trace_inputs_smoke_test.py
+++ b/tools/isolate/trace_inputs_smoke_test.py
@@ -97,6 +97,10 @@ class TraceInputsBase(unittest.TestCase):
       cmd.extend([os.path.join('data', 'trace_inputs', 'child1.py'), '--child'])
     return cmd
 
+  @staticmethod
+  def _size(*args):
+    return os.stat(os.path.join(ROOT_DIR, *args)).st_size
+
 
 class TraceInputs(TraceInputsBase):
   def _execute(self, mode, command, cwd):
@@ -148,10 +152,6 @@ class TraceInputs(TraceInputsBase):
     self.assertEquals(expected, actual)
     self.assertEquals(trace_expected, trace_actual)
 
-  @staticmethod
-  def _size(*args):
-    return os.stat(os.path.join(ROOT_DIR, *args)).st_size
-
   def test_trace_json(self):
     expected = {
       u'root': {
@@ -260,8 +260,6 @@ class TraceInputsImport(TraceInputsBase):
     self.assertEquals([], simplified)
 
   def test_trace(self):
-    size_t_i_s = os.stat(FULLNAME).st_size
-    size_t_i = os.stat(os.path.join(ROOT_DIR, 'trace_inputs.py')).st_size
     expected = {
       'root': {
         'children': [
@@ -272,11 +270,11 @@ class TraceInputsImport(TraceInputsBase):
             'files': [
               {
                 'path': os.path.join(u'data', 'trace_inputs', 'child2.py'),
-                'size': 776,
+                'size': self._size('data', 'trace_inputs', 'child2.py'),
               },
               {
                 'path': os.path.join(u'data', 'trace_inputs', 'test_file.txt'),
-                'size': 4,
+                'size': self._size('data', 'trace_inputs', 'test_file.txt'),
               },
             ],
             'initial_cwd': self.initial_cwd,
@@ -291,15 +289,15 @@ class TraceInputsImport(TraceInputsBase):
         'files': [
           {
             'path': os.path.join(u'data', 'trace_inputs', 'child1.py'),
-            'size': 1364,
+            'size': self._size('data', 'trace_inputs', 'child1.py'),
           },
           {
             'path': u'trace_inputs.py',
-            'size': size_t_i,
+            'size': self._size('trace_inputs.py'),
           },
           {
             'path': u'trace_inputs_smoke_test.py',
-            'size': size_t_i_s,
+            'size': self._size('trace_inputs_smoke_test.py'),
           },
         ],
         'initial_cwd': self.initial_cwd,
-- 
cgit v1.1