Switch over testing pub seperately from the the normal packages

tools/bots/pkg.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """
-Pub buildbot steps.
+Pkg buildbot steps.
 
-Runs tests for pub and the pub packages that are hosted in the main Dart repo.
+Runs tests for packages that are hosted in the main Dart repo and in
+third_party/pkg_tested.
 """
 
 import re
 import sys
 
 import bot
 
-PUB_BUILDER = r'pub-(linux|mac|win)(-(russian))?(-(debug))?'
+PKG_BUILDER = r'pkg-(linux|mac|win)(-(russian))?(-(debug))?'
 
-def PubConfig(name, is_buildbot):
+def PkgConfig(name, is_buildbot):
   """Returns info for the current buildbot based on the name of the builder.
 
   Currently, this is just:
   - mode: "debug", "release"
   - system: "linux", "mac", or "win"
   """
-  pub_pattern = re.match(PUB_BUILDER, name)
-  if not pub_pattern:
+  pkg_pattern = re.match(PKG_BUILDER, name)
+  if not pkg_pattern:
     return None
 
-  system = pub_pattern.group(1)
-  locale = pub_pattern.group(3)
-  mode = pub_pattern.group(5) or 'release'
+  system = pkg_pattern.group(1)
+  locale = pkg_pattern.group(3)
+  mode = pkg_pattern.group(5) or 'release'
   if system == 'win': system = 'windows'
 
   return bot.BuildInfo('none', 'vm', mode, system, checked=True,
                        builder_tag=locale)
 
-def PubSteps(build_info):
+def PkgSteps(build_info):
   with bot.BuildStep('Build package-root'):
     args = [sys.executable, './tools/build.py', '--mode=' + build_info.mode,
             'packages']
     print 'Building package-root: %s' % (' '.join(args))
     bot.RunProcess(args)
 
   common_args = ['--write-test-outcome-log']
   if build_info.builder_tag:
     common_args.append('--builder-tag=%s' % build_info.builder_tag)
 
   # There are a number of big/integration tests in pkg, run with bigger timeout
   common_args.append('--timeout=120')
   # We have some unreproducible vm crashes on these bots
   common_args.append('--copy-coredumps')
 
+  # We are seeing issues with pub get calls on the windows bots.
+  # Experiment with not running concurrent calls.
   if build_info.system == 'windows':
     common_args.append('-j1')
   if build_info.mode == 'release':
-    bot.RunTest('pub and pkg ', build_info,
-                common_args + ['pub', 'pkg', 'docs', 'pkg_tested'],
+    bot.RunTest('pkg ', build_info,
+                common_args + ['pkg', 'docs', 'pkg_tested'],
                 swallow_error=True)
   else:
-    # Pub tests currently have a lot of timeouts when run in debug mode.
+    # Pkg tests currently have a lot of timeouts when run in debug mode.
     # See issue 18479
-    bot.RunTest('pub and pkg', build_info, common_args + ['pkg', 'docs'],
+    bot.RunTest('pkg', build_info, common_args + ['pkg', 'docs'],
                 swallow_error=True)
 
   if build_info.mode == 'release':
     pkgbuild_build_info = bot.BuildInfo('none', 'vm', build_info.mode,
                                         build_info.system, checked=False)
     bot.RunTest('pkgbuild_repo_pkgs', pkgbuild_build_info,
                 common_args + ['--append_logs', '--use-repository-packages',
                                'pkgbuild'],
                 swallow_error=True)
 
-    # We are seeing issues with pub get calls on the windows bots.
-    # Experiment with not running concurrent calls.
     public_args = (common_args +
                    ['--append_logs', '--use-public-packages', 'pkgbuild'])
     bot.RunTest('pkgbuild_public_pkgs', pkgbuild_build_info, public_args)
 
 if __name__ == '__main__':
-  bot.RunBot(PubConfig, PubSteps)
+  bot.RunBot(PkgConfig, PkgSteps)