Add NOEXPORT=true commit message whenever import script is run.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater_unittest.py

 # Copyright 2016 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.
 
 import unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.w3c.deps_updater import DepsUpdater
 
@@ skipping 57 matching lines @@
         updater._has_changes = lambda: True
         updater._commit_changes('dummy message')
         self.assertEqual(
             host.executive.calls,
             [['git', 'commit', '--all', '-F', '-']])
 
     def test_commit_message(self):
         updater = DepsUpdater(MockHost())
         self.assertEqual(
             updater._commit_message('aaaa', '1111'),
-            'Import 1111\n\nUsing update-w3c-deps in Chromium aaaa.\n\n')
+            'Import 1111\n\n'
+            'Using update-w3c-deps in Chromium aaaa.\n\n'
+            'NOEXPORT=true')
 
     def test_cl_description_with_empty_environ(self):
         host = MockHost()
         host.executive = MockExecutive(output='Last commit message\n')
         updater = DepsUpdater(host)
         description = updater._cl_description()
         self.assertEqual(
             description,
             ('Last commit message\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
         self.assertEqual(host.executive.calls, [['git', 'log', '-1', '--format=%B']])
 
     def test_cl_description_with_environ_variables(self):
         host = MockHost()
         host.executive = MockExecutive(output='Last commit message\n')
         updater = DepsUpdater(host)
         updater.host.environ['BUILDBOT_MASTERNAME'] = 'my.master'
         updater.host.environ['BUILDBOT_BUILDERNAME'] = 'b'
         updater.host.environ['BUILDBOT_BUILDNUMBER'] = '123'
         description = updater._cl_description()
         self.assertEqual(
             description,
             ('Last commit message\n'
              'Build: https://build.chromium.org/p/my.master/builders/b/builds/123\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
         self.assertEqual(host.executive.calls, [['git', 'log', '-1', '--format=%B']])
 
+    def test_cl_description_moves_noexport_tag(self):
+        host = MockHost()
+        host.executive = MockExecutive(output='Summary\n\nNOEXPORT=true')
+        updater = DepsUpdater(host)
+        description = updater._cl_description()
+        self.assertEqual(
+            description,
+            ('Summary\n\n'
+             'TBR=qyearsley@chromium.org\n'
+             'NOEXPORT=true'))
+
     def test_generate_manifest_command_not_found(self):
         # If we're updating csswg-test, then the manifest file won't be found.
         host = MockHost()
         host.filesystem.files = {}
         updater = DepsUpdater(host)
         updater._generate_manifest(
             '/mock-checkout/third_party/WebKit/LayoutTests/external/csswg-test')
         self.assertEqual(host.executive.calls, [])
 
     def test_generate_manifest_successful_run(self):
@@ skipping 11 matching lines @@
                     '--work',
                     '--tests-root',
                     '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt'
                 ],
                 [
                     'git',
                     'add',
                     '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt/MANIFEST.json'
                 ]
             ])