From 6d01f6d220ea83f6be3240f1bce7d44abdc91f6e Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Thu, 14 Sep 2017 17:02:01 +0200 Subject: [PATCH] Fix PRESUBMIT.py NOTRY=True TBR=kjellander@webrtc.org Bug: webrtc:8197 Change-Id: Ie8b50faec7c6c5f7b9dd259c8312e4cec5748a42 Reviewed-on: https://webrtc-review.googlesource.com/1361 Commit-Queue: Edward Lemur Reviewed-by: Charu Jain Reviewed-by: Edward Lemur Cr-Commit-Position: refs/heads/master@{#19838} --- PRESUBMIT.py | 2 +- presubmit_test.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 presubmit_test.py diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 1666c6b905..927869f5f9 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -493,7 +493,7 @@ def RunPythonTests(input_api, output_api): return input_api.os_path.join(input_api.PresubmitLocalPath(), *args) test_directories = [ - '/', + input_api.PresubmitLocalPath(), Join('webrtc', 'rtc_tools', 'py_event_log_analyzer'), Join('webrtc', 'rtc_tools'), Join('webrtc', 'audio', 'test', 'unittests'), diff --git a/presubmit_test.py b/presubmit_test.py old mode 100644 new mode 100755 index d8dd94ed16..2d0dc55c09 --- a/presubmit_test.py +++ b/presubmit_test.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 import unittest import PRESUBMIT @@ -10,7 +11,7 @@ class CheckBugEntryField(unittest.TestCase): mock_output_api = MockOutputApi() mock_input_api.change.BUG = 'webrtc:1234' errors = PRESUBMIT.CheckCommitMessageBugEntry(mock_input_api, - mock_output_api) + mock_output_api) self.assertEqual(0, len(errors)) def testCommitMessageBugEntryReturnError(self): @@ -18,7 +19,7 @@ class CheckBugEntryField(unittest.TestCase): mock_output_api = MockOutputApi() mock_input_api.change.BUG = 'webrtc:1234,webrtc=4321' errors = PRESUBMIT.CheckCommitMessageBugEntry(mock_input_api, - mock_output_api) + mock_output_api) self.assertEqual(1, len(errors)) self.assertEqual(('Bogus BUG entry: webrtc=4321. Please specify' ' the issue tracker prefix and the issue number,' @@ -30,7 +31,7 @@ class CheckBugEntryField(unittest.TestCase): mock_output_api = MockOutputApi() mock_input_api.change.BUG = 'None' errors = PRESUBMIT.CheckCommitMessageBugEntry(mock_input_api, - mock_output_api) + mock_output_api) self.assertEqual(0, len(errors))