L1 Testing

.gitignore

@@ -7,9 +7,10 @@
 **/.vscode
 **/*.error
 **/*.json.pretty
-node_modules
+**/node_modules
 _downloads
 _layout
+_l1
 _package
 _reports
 _dotnetsdk

.vsts.template.nonwindows.yml

@@ -20,9 +20,14 @@ steps:
   displayName: Build & Layout Release
 
 # Run test
-- script: ./dev.sh test
+- script: ./dev.sh testl0
   workingDirectory: src
-  displayName: Test
+  displayName: Unit tests
+
+- script: ./dev.sh testl1
+  workingDirectory: src
+  displayName: Functional tests
+  condition: ne('${{ parameters.testLogTitle }}', 'Linux-ARM')
 
 # Publish test results
 - task: PublishTestResults@2

.vsts.template.windows.yml

@@ -29,9 +29,13 @@ steps:
   displayName: Build & Layout Release
 
 # Run test
-- script: dev.cmd test
+- script: dev.cmd testl0
   workingDirectory: src
-  displayName: Test
+  displayName: Unit tests
+
+- script: dev.cmd testl1
+  workingDirectory: src
+  displayName: Functional tests
 
 # Publish test results
 - task: PublishTestResults@2

src/Agent.Plugins/GitCliManager.cs

@@ -26,15 +26,15 @@ private static Encoding _encoding
                 : null;
         }
 
-        private readonly Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        protected readonly Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
             { "GIT_TERMINAL_PROMPT", "0" },
         };
 
-        private string gitPath = null;
-        private Version gitVersion = null;
-        private string gitLfsPath = null;
-        private Version gitLfsVersion = null;
+        protected string gitPath = null;
+        protected Version gitVersion = null;
+        protected string gitLfsPath = null;
+        protected Version gitLfsVersion = null;
 
         public GitCliManager(Dictionary<string, string> envs = null)
         {
@@ -76,7 +76,7 @@ public bool EnsureGitLFSVersion(Version requiredVersion, bool throwOnNotMatch)
             return gitLfsVersion >= requiredVersion;
         }
 
-        public async Task LoadGitExecutionInfo(AgentTaskPluginExecutionContext context, bool useBuiltInGit)
+        public virtual async Task LoadGitExecutionInfo(AgentTaskPluginExecutionContext context, bool useBuiltInGit)
         {
             // There is no built-in git for OSX/Linux
             gitPath = null;
@@ -495,7 +495,7 @@ public async Task<int> GitLFSLogs(AgentTaskPluginExecutionContext context, strin
         }
 
         // git version
-        public async Task<Version> GitVersion(AgentTaskPluginExecutionContext context)
+        public virtual async Task<Version> GitVersion(AgentTaskPluginExecutionContext context)
         {
             context.Debug("Get git version.");
             string workingDir = context.Variables.GetValueOrDefault("agent.workfolder")?.Value;
@@ -528,7 +528,7 @@ public async Task<Version> GitVersion(AgentTaskPluginExecutionContext context)
         }
 
         // git lfs version
-        public async Task<Version> GitLfsVersion(AgentTaskPluginExecutionContext context)
+        public virtual async Task<Version> GitLfsVersion(AgentTaskPluginExecutionContext context)
         {
             context.Debug("Get git-lfs version.");
             string workingDir = context.Variables.GetValueOrDefault("agent.workfolder")?.Value;
@@ -560,7 +560,7 @@ public async Task<Version> GitLfsVersion(AgentTaskPluginExecutionContext context
             return version;
         }
 
-        private async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext context, string repoRoot, string command, string options, CancellationToken cancellationToken = default(CancellationToken))
+        protected virtual async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext context, string repoRoot, string command, string options, CancellationToken cancellationToken = default(CancellationToken))
         {
             string arg = StringUtil.Format($"{command} {options}").Trim();
             context.Command($"git {arg}");
@@ -586,7 +586,7 @@ public async Task<Version> GitLfsVersion(AgentTaskPluginExecutionContext context
                 cancellationToken: cancellationToken);
         }
 
-        private async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext context, string repoRoot, string command, string options, IList<string> output)
+        protected virtual async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext context, string repoRoot, string command, string options, IList<string> output)
         {
             string arg = StringUtil.Format($"{command} {options}").Trim();
             context.Command($"git {arg}");
@@ -617,7 +617,7 @@ private async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext c
                 cancellationToken: default(CancellationToken));
         }
 
-        private async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext context, string repoRoot, string command, string options, string additionalCommandLine, CancellationToken cancellationToken)
+        protected virtual async Task<int> ExecuteGitCommandAsync(AgentTaskPluginExecutionContext context, string repoRoot, string command, string options, string additionalCommandLine, CancellationToken cancellationToken)
         {
             string arg = StringUtil.Format($"{additionalCommandLine} {command} {options}").Trim();
             context.Command($"git {arg}");

src/Agent.Plugins/GitSourceProvider.cs

@@ -75,7 +75,7 @@ public override void RequirementCheck(AgentTaskPluginExecutionContext executionC
         }
     }
 
-    public sealed class BitbucketGitSourceProvider : AuthenticatedGitSourceProvider
+    public class BitbucketGitSourceProvider : AuthenticatedGitSourceProvider
     {
         public override bool GitSupportsFetchingCommitBySha1Hash
         {
@@ -86,7 +86,7 @@ public override bool GitSupportsFetchingCommitBySha1Hash
         }
     }
 
-    public sealed class GitHubSourceProvider : AuthenticatedGitSourceProvider
+    public class GitHubSourceProvider : AuthenticatedGitSourceProvider
     {
         public override bool GitSupportsFetchingCommitBySha1Hash
         {
@@ -97,7 +97,7 @@ public override bool GitSupportsFetchingCommitBySha1Hash
         }
     }
 
-    public sealed class TfsGitSourceProvider : GitSourceProvider
+    public class TfsGitSourceProvider : GitSourceProvider
     {
         public override bool GitSupportsFetchingCommitBySha1Hash
         {
@@ -382,7 +382,7 @@ public async Task GetSourceAsync(
                 gitEnv[formattedKey] = variable.Value?.Value ?? string.Empty;
             }
 
-            GitCliManager gitCommandManager = new GitCliManager(gitEnv);
+            GitCliManager gitCommandManager = GetCliManager(gitEnv);
             await gitCommandManager.LoadGitExecutionInfo(executionContext, useBuiltInGit: !preferGitFromPath);
 
             bool gitSupportAuthHeader = GitSupportUseAuthHeader(executionContext, gitCommandManager);
@@ -1191,7 +1191,7 @@ public async Task PostJobCleanupAsync(AgentTaskPluginExecutionContext executionC
                 bool preferGitFromPath = StringUtil.ConvertToBoolean(executionContext.TaskVariables.GetValueOrDefault("preferPath")?.Value);
 
                 // Initialize git command manager
-                GitCliManager gitCommandManager = new GitCliManager();
+                GitCliManager gitCommandManager = GetCliManager();
                 await gitCommandManager.LoadGitExecutionInfo(executionContext, useBuiltInGit: !preferGitFromPath);
 
                 executionContext.Debug("Remove any extraheader, proxy and client cert setting from git config.");
@@ -1219,6 +1219,11 @@ public async Task PostJobCleanupAsync(AgentTaskPluginExecutionContext executionC
             }
         }
 
+        protected virtual GitCliManager GetCliManager(Dictionary<string, string> gitEnv = null)
+        {
+            return new GitCliManager(gitEnv);
+        }
+
         private async Task<bool> IsRepositoryOriginUrlMatch(AgentTaskPluginExecutionContext context, GitCliManager gitCommandManager, string repositoryPath, Uri expectedRepositoryOriginUrl)
         {
             context.Debug($"Checking if the repo on {repositoryPath} matches the expected repository origin URL. expected Url: {expectedRepositoryOriginUrl.AbsoluteUri}");

src/Agent.Plugins/RepositoryPlugin.cs

@@ -45,7 +45,7 @@ protected RepositoryTask(ISourceProviderFactory sourceProviderFactory)
 
         public Guid Id => Pipelines.PipelineConstants.CheckoutTask.Id;
 
-        public ISourceProviderFactory SourceProviderFactory { get; }
+        public ISourceProviderFactory SourceProviderFactory { get; set; }
 
         public abstract string Stage { get; }
 
@@ -214,9 +214,9 @@ public interface ISourceProviderFactory
         ISourceProvider GetSourceProvider(string repositoryType);
     }
 
-    public sealed class SourceProviderFactory : ISourceProviderFactory
+    public class SourceProviderFactory : ISourceProviderFactory
     {
-        public ISourceProvider GetSourceProvider(string repositoryType)
+        public virtual ISourceProvider GetSourceProvider(string repositoryType)
         {
             ISourceProvider sourceProvider = null;
 

src/Agent.Sdk/Util/StringUtil.cs

@@ -181,6 +181,20 @@ private static string Format(CultureInfo culture, string format, params object[]
             }
         }
 
+        // Used for L1 testing
+        public static void LoadExternalLocalization(string stringsPath)
+        {
+            var locStrings = new Dictionary<string, object>();
+            if (File.Exists(stringsPath))
+            {
+                foreach (KeyValuePair<string, object> pair in IOUtil.LoadObject<Dictionary<string, object>>(stringsPath))
+                {
+                    locStrings[pair.Key] = pair.Value;
+                }
+            }
+            s_locStrings = locStrings;
+        }
+
         private static void EnsureLoaded()
         {
             if (s_locStrings == null)

src/Agent.Worker/AgentPluginManager.cs

@@ -22,11 +22,11 @@ public interface IAgentPluginManager : IAgentService
         Task RunPluginTaskAsync(IExecutionContext context, string plugin, Dictionary<string, string> inputs, Dictionary<string, string> environment, Variables runtimeVariables, EventHandler<ProcessDataReceivedEventArgs> outputHandler);
     }
 
-    public sealed class AgentPluginManager : AgentService, IAgentPluginManager
+    public class AgentPluginManager : AgentService, IAgentPluginManager
     {
         private readonly Dictionary<Guid, List<string>> _supportedTasks = new Dictionary<Guid, List<string>>();
 
-        private readonly HashSet<string> _taskPlugins = new HashSet<string>()
+        protected readonly HashSet<string> _taskPlugins = new HashSet<string>()
         {
             "Agent.Plugins.Repository.CheckoutTask, Agent.Plugins",
             "Agent.Plugins.Repository.CleanupTask, Agent.Plugins",

src/Agent.Worker/AsyncCommandContext.cs

@@ -16,6 +16,7 @@ public interface IAsyncCommandContext : IAgentService
         void Output(string message);
         void Debug(string message);
         Task WaitAsync();
+        IHostContext GetHostContext();
     }
 
     public class AsyncCommandContext : AgentService, IAsyncCommandContext
@@ -50,6 +51,11 @@ public void InitializeCommandContext(IExecutionContext context, string name)
             Name = name;
         }
 
+        public IHostContext GetHostContext()
+        {
+            return _executionContext.GetHostContext();
+        }
+
         public void Output(string message)
         {
             _outputQueue.Enqueue(new OutputMessage(OutputType.Info, message));

src/Agent.Worker/Build/ArtifactCommandExtension.cs

@@ -216,8 +216,9 @@ public static async Task AssociateArtifactAsync(
             Dictionary<string, string> propertiesDictionary,
             CancellationToken cancellationToken)
         {
-            BuildServer buildHelper = new BuildServer(connection, projectId);
-            var artifact = await buildHelper.AssociateArtifactAsync(buildId, name, jobId, type, data, propertiesDictionary, cancellationToken);
+            var buildHelper = context.GetHostContext().GetService<IBuildServer>();
+            await buildHelper.ConnectAsync(connection);
+            var artifact = await buildHelper.AssociateArtifactAsync(buildId, projectId, name, jobId, type, data, propertiesDictionary, cancellationToken);
             context.Output(StringUtil.Loc("AssociateArtifactWithBuild", artifact.Id, buildId));
         }
 
@@ -234,15 +235,16 @@ public static async Task UploadArtifactAsync(
             string source,
             CancellationToken cancellationToken)
         {
-            FileContainerServer fileContainerHelper = new FileContainerServer(connection, projectId, containerId, containerPath);
-            long size = await fileContainerHelper.CopyToContainerAsync(context, source, cancellationToken);
+            var fileContainerHelper = new FileContainerServer(connection, projectId, containerId, containerPath);
+            var size = await fileContainerHelper.CopyToContainerAsync(context, source, cancellationToken);
             propertiesDictionary.Add(ArtifactUploadEventProperties.ArtifactSize, size.ToString());
 
-            string fileContainerFullPath = StringUtil.Format($"#/{containerId}/{containerPath}");
+            var fileContainerFullPath = StringUtil.Format($"#/{containerId}/{containerPath}");
             context.Output(StringUtil.Loc("UploadToFileContainer", source, fileContainerFullPath));
 
-            BuildServer buildHelper = new BuildServer(connection, projectId);
-            var artifact = await buildHelper.AssociateArtifactAsync(buildId, name, jobId, ArtifactResourceTypes.Container, fileContainerFullPath, propertiesDictionary, cancellationToken);
+            var buildHelper = context.GetHostContext().GetService<IBuildServer>();
+            await buildHelper.ConnectAsync(connection);
+            var artifact = await buildHelper.AssociateArtifactAsync(buildId, projectId, name, jobId, ArtifactResourceTypes.Container, fileContainerFullPath, propertiesDictionary, cancellationToken);
             context.Output(StringUtil.Loc("AssociateArtifactWithBuild", artifact.Id, buildId));
         }
 

src/Agent.Worker/Build/BuildCommandExtension.cs

@@ -14,7 +14,7 @@
 
 namespace Microsoft.VisualStudio.Services.Agent.Worker.Build
 {
-    public sealed class BuildCommandExtension: BaseWorkerCommandExtension
+    public sealed class BuildCommandExtension : BaseWorkerCommandExtension
     {
         public BuildCommandExtension()
         {
@@ -27,7 +27,7 @@ public BuildCommandExtension()
         }
     }
 
-    public sealed class BuildUploadLogCommand: IWorkerCommand
+    public sealed class BuildUploadLogCommand : IWorkerCommand
     {
         public string Name => "uploadlog";
         public List<string> Aliases => null;
@@ -49,7 +49,7 @@ public void Execute(IExecutionContext context, Command command)
 
     // ##VSO[build.uploadsummary] command has been deprecated
     // Leave the implementation on agent for back compat
-    public sealed class BuildUploadSummaryCommand: IWorkerCommand
+    public sealed class BuildUploadSummaryCommand : IWorkerCommand
     {
         public string Name => "uploadsummary";
         public List<string> Aliases => null;
@@ -70,7 +70,7 @@ public void Execute(IExecutionContext context, Command command)
         }
     }
 
-    public sealed class BuildUpdateBuildNumberCommand: IWorkerCommand
+    public sealed class BuildUpdateBuildNumberCommand : IWorkerCommand
     {
         public string Name => "updatebuildnumber";
         public List<string> Aliases => null;
@@ -119,13 +119,14 @@ private async Task UpdateBuildNumberAsync(
             string buildNumber,
             CancellationToken cancellationToken)
         {
-            BuildServer buildServer = new BuildServer(connection, projectId);
-            var build = await buildServer.UpdateBuildNumber(buildId, buildNumber, cancellationToken);
+            var buildServer = context.GetHostContext().GetService<IBuildServer>();
+            await buildServer.ConnectAsync(connection);
+            var build = await buildServer.UpdateBuildNumber(buildId, projectId, buildNumber, cancellationToken);
             context.Output(StringUtil.Loc("UpdateBuildNumberForBuild", build.BuildNumber, build.Id));
         }
     }
 
-    public sealed class BuildAddBuildTagCommand: IWorkerCommand
+    public sealed class BuildAddBuildTagCommand : IWorkerCommand
     {
         public string Name => "addbuildtag";
         public List<string> Aliases => null;
@@ -170,8 +171,9 @@ private async Task AddBuildTagAsync(
             string buildTag,
             CancellationToken cancellationToken)
         {
-            BuildServer buildServer = new BuildServer(connection, projectId);
-            var tags = await buildServer.AddBuildTag(buildId, buildTag, cancellationToken);
+            var buildServer = context.GetHostContext().GetService<IBuildServer>();
+            await buildServer.ConnectAsync(connection);
+            var tags = await buildServer.AddBuildTag(buildId, projectId, buildTag, cancellationToken);
 
             if (tags == null || !tags.Any(t => t.Equals(buildTag, StringComparison.OrdinalIgnoreCase)))
             {