Enter a description of the change.

client/cmd/isolate/batch_archive_test.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package main
 
 import (
         "path/filepath"
         "strings"
         "testing"
 
-        "github.com/luci/luci-go/client/internal/common"
+        "github.com/luci/luci-go/client/isolate"
         "github.com/luci/luci-go/common/flag/stringmapflag"
 
         . "github.com/smartystreets/goconvey/convey"
 )
 
 func TestConvertPyToGoArchiveCMDArgs(t *testing.T) {
         t.Parallel()
         Convey(`Archive command line arguments should be converted properly for Go.`, t, func() {
                 data := []struct {
                         input    []string
@@ skipping 61 matching lines @@
                         "--extra-variable", "version_full=42.0.2284.0",
                         "--config-variable", "OS=linux",
                 }
                 root := absToOS("e:", "/tmp/bar")
                 opts, err := parseArchiveCMD(args, root)
                 base := filepath.Dir(root)
                 So(opts.Isolate, ShouldResemble, filepath.Join(base, "boz", "bar.isolate"))
                 So(opts.Isolated, ShouldResemble, filepath.Join(base, "biz", "bar.isolated"))
                 So(err, ShouldBeNil)
                 So(stringmapflag.Value{"OS": "linux"}, ShouldResemble, opts.ConfigVariables)
-                if common.IsWindows() {
+                if isolate.IsWindows() {
                         So(stringmapflag.Value{"PRODUCT_DIR": "../../out/Release", "EXECUTABLE_SUFFIX": ".exe", "DEPTH": "../.."}, ShouldResemble, opts.PathVariables)
                 } else {
                         So(stringmapflag.Value{"PRODUCT_DIR": "../../out/Release", "EXECUTABLE_SUFFIX": "", "DEPTH": "../.."}, ShouldResemble, opts.PathVariables)
                 }
                 So(stringmapflag.Value{"version_full": "42.0.2284.0"}, ShouldResemble, opts.ExtraVariables)
         })
 }
 
 // Verify that if the isolate/isolated paths are absolute, we don't
 // accidentally interpret them as relative to the cwd.
 func TestArchiveAbsolutePaths(t *testing.T) {
         t.Parallel()
         Convey(`Archive command line should correctly handle absolute paths.`, t, func() {
                 root := absToOS("e:", "/tmp/bar/")
                 args := []string{
                         "--isolated", root + "foo.isolated",
                         "--isolate", root + "foo.isolate",
                 }
                 opts, err := parseArchiveCMD(args, absToOS("x:", "/var/lib"))
                 So(err, ShouldBeNil)
                 So(opts.Isolate, ShouldResemble, root+"foo.isolate")
                 So(opts.Isolated, ShouldResemble, root+"foo.isolated")
         })
 }
 
 // Private stuff.
 
 // absToOS converts a POSIX path to OS specific format.
 func absToOS(drive, p string) string {
-        if common.IsWindows() {
+        if isolate.IsWindows() {
                 return drive + strings.Replace(p, "/", "\\", -1)
         }
         return p
 }