Minor improvements:

* testdir can be changed
* testdir is no longer incorporated into the delivery
* pip calls will use an index if defined
* multiarg now returns empty string if input is empty
* remove clone repos if they already exist. guarantees pristine code/tests

1 files changed, 29 insertions, 8 deletions

diff --git a/source/app.d b/source/app.d
index 3252c62..65966e4 100644
--- a/source/app.d
+++ b/source/app.d
@@ -14,6 +14,7 @@ import util;
 
 int main(string[] args) {
     string output_dir = "delivery";
+    string test_dir = "testdir";
     string installer_prefix = "miniconda";
     string installer_variant = "3";
     string installer_version = "4.5.12";
@@ -34,6 +35,7 @@ int main(string[] args) {
             config.passThrough,
             config.required, "config", "dm yaml configuration", &configfile,
             "output-dir|o", "store delivery-related results in dir", &output_dir,
+            "test-dir|t", "store test-related results in dir", &test_dir,
             "install-prefix|p", "path to install miniconda", &installer_prefix,
             "install-variant", "miniconda Python variant", &installer_variant,
             "install-version|i", "version of miniconda installer", &installer_version,
@@ -52,6 +54,7 @@ int main(string[] args) {
     Session_t session = getconf(configfile);
     installer_prefix = buildPath(installer_prefix).absolutePath;
     output_dir = buildPath(output_dir, session.delivery).absolutePath;
+    test_dir = buildPath(test_dir).absolutePath;
 
     dumpfile_yaml = buildPath(output_dir, session.delivery ~ ".yml");
     dumpfile_explicit = buildPath(output_dir, session.delivery ~ ".txt");
@@ -82,11 +85,15 @@ int main(string[] args) {
         return 1;
     }
 
+    // Assimilate environment variables from the configuration file
     foreach (pair; session.runtime.byPair) {
         conda.env[pair.key] = session.runtime[pair.key];
     }
+
+    // Place miniconda at the head of PATH.
     conda.initialize();
 
+    // When reusing an environment it's best to destroy it before continuing.
     if (conda.env_exists(session.delivery)) {
         writefln("Environment '%s' already exists. Removing.", session.delivery);
         conda.run("env remove -n " ~ session.delivery);
@@ -102,6 +109,7 @@ int main(string[] args) {
         output_dir.mkdirRecurse;
     }
 
+    // Generate deliverables
     conda.activate(session.delivery);
     writeln("Creating YAML dump: " ~ dumpfile_yaml);
     conda.dump_env_yaml(dumpfile_yaml);
@@ -112,25 +120,38 @@ int main(string[] args) {
     conda.deactivate();
 
     if (session.run_tests) {
+        if (!test_dir.exists) {
+            writeln("Creating test output directory: " ~ test_dir);
+            test_dir.mkdirRecurse;
+        }
+
         int failures = 0;
-        string testdir = buildPath(output_dir, "testdir");
+
+        // Discover git repository data for just-installed packages
         testable_t[] pkgs = testable_packages(conda, session.conda_requirements, session.test_filter_git_orgs);
 
         // Allow use of environment variables in test program argument list
         session.test_args = interpolate(conda.env, session.test_args);
 
+        // Process each package, executing its tests
         foreach (i, pkg; pkgs.enumerate(0)) {
-            string tmpenv = format("%04d_%s", i, session.delivery);
-            if(conda.run("create -n " ~ tmpenv ~ " --clone " ~ session.delivery)) {
-                return false;
+            string cloned = format("%04d_%s", i, session.delivery);
+            if(conda.run("create -n " ~ cloned ~ " --clone " ~ session.delivery)) {
+                return 1;
             }
-            conda.activate(tmpenv);
 
-            failures += integration_test(session, conda, testdir, pkg);
+            // activate conda on the cloned environment
+            conda.activate(cloned);
+
+            // count up the number of failures
+            failures += integration_test(session, conda, test_dir, pkg);
 
+            // deactivate conda environment
             conda.deactivate();
-            if(conda.run("env remove -n " ~ tmpenv)) {
-                return false;
+
+            // remove conda environement
+            if(conda.run("env remove -n " ~ cloned)) {
+                return 1;
             }
         }