Now cleaning tests from out folder.

Gruntfile.js

@@ -73,6 +73,10 @@ module.exports = function(grunt) {
       buildAppEnginePackageWithTests: {
         command: ['python', './build/build_app_engine_package.py', 'src',
                   out_app_engine_dir, '--include-tests'].join(' ')
+      },
+      removePythonTestsFromOutAppEngineDir: {
+        command: ['python', './build/remove_python_tests.py',
+                  out_app_engine_dir].join(' ')
       }
     },
 
@@ -178,7 +182,8 @@ module.exports = function(grunt) {
                                 'default']);
   grunt.registerTask('runPythonTests', ['shell:buildAppEnginePackageWithTests',
                                         'shell:getPythonTestDeps',
-                                        'shell:runPythonTests']);
+                                        'shell:runPythonTests',
+                                        'shell:removePythonTestsFromOutAppEngineDir']);
   grunt.registerTask('jstests', ['closurecompiler:debug', 'jstdPhantom']);
   // buildAppEnginePackage must be done before closurecompiler since buildAppEnginePackage resets out/app_engine.
   grunt.registerTask('build', ['shell:buildAppEnginePackage', 'closurecompiler:debug', 'grunt-chrome-build']);

build/build_app_engine_package.py

@@ -10,6 +10,8 @@
 import subprocess
 import sys
 
+import test_file_herder
+
 USAGE = """%prog src_path dest_path
 Build the GAE source code package.
 
@@ -96,14 +98,6 @@ def CopyApprtcSource(src_path, dest_path):
   build_version_info_file(os.path.join(dest_path, 'version_info.json'))
 
 
-def CopyTests(src_path, dest_path):
-  for dirpath, _, files in os.walk(src_path):
-    if dirpath.endswith('app_engine'):
-      tests = [name for name in files if 'test' in name]
-      for test in tests:
-        shutil.copy(os.path.join(dirpath, test), dest_path)
-
-
 def main():
   parser = optparse.OptionParser(USAGE)
   parser.add_option("-t", "--include-tests", action="store_true",
@@ -115,7 +109,8 @@ def main():
   src_path, dest_path = args[0:2]
   CopyApprtcSource(src_path, dest_path)
   if options.include_tests:
-    CopyTests(src_path, dest_path)
+    app_engine_code = os.path.join(src_path, 'app_engine')
+    test_file_herder.CopyTests(os.path.join(src_path, 'app_engine'), dest_path)
 
 
 if __name__ == '__main__':

build/remove_python_tests.py

@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import optparse
+import sys
+
+import test_file_herder
+
+
+def main():
+  parser = optparse.OptionParser('Usage: %prog path_to_tests')
+  _, args = parser.parse_args()
+  if len(args) != 1:
+    parser.error('Expected precisely one argument.')
+
+  return test_file_herder.RemoveTests(args[0])
+
+if __name__ == '__main__':
+  sys.exit(main())

build/test_file_herder.py

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+"""Copies and deletes tests."""
+
+import os
+import shutil
+
+
+def _IsPythonTest(filename):
+  return 'test' in filename and filename.endswith('.py')
+
+
+def CopyTests(src_path, dest_path):
+  if not os.path.exists(src_path):
+    raise Exception('Failed to copy tests from %s; does not exist.' % src_path)
+
+  for dirpath, _, files in os.walk(src_path):
+    tests = [name for name in files if _IsPythonTest(name)]
+    for test in tests:
+      shutil.copy(os.path.join(dirpath, test), dest_path)
+
+
+def RemoveTests(path):
+  if not os.path.exists(path):
+    raise Exception('Failed to remove tests from %s; does not exist.' % path)
+
+  for dirpath, _, files in os.walk(path):
+    tests = [name for name in files if _IsPythonTest(name)]
+    for test in tests:
+      to_remove = os.path.join(dirpath, test)
+      print 'Removing %s.' % to_remove
+      os.remove(to_remove)