adjust PATH in tests to work on macOS and windows without conda

Author: bjarthur

test/congruence.py

@@ -19,7 +19,7 @@ def check_value(dfrow, colname, shouldbe):
 
 _, repo_path, bindirs = get_srcrepobindirs()
 
-os.environ['PATH'] = os.pathsep.join([*os.environ['PATH'].split(os.pathsep), *bindirs])
+os.environ['PATH'] = os.pathsep.join([*bindirs, *os.environ['PATH'].split(os.pathsep)])
 
 sys.path.append(os.path.join(repo_path, "src", "gui"))
 import model as M

test/freeze-classify.py

@@ -18,7 +18,7 @@
 
 _, repo_path, bindirs = get_srcrepobindirs()
 
-os.environ['PATH'] = os.pathsep.join([*os.environ['PATH'].split(os.pathsep), *bindirs])
+os.environ['PATH'] = os.pathsep.join([*bindirs, *os.environ['PATH'].split(os.pathsep)])
 
 sys.path.append(os.path.join(repo_path, "src", "gui"))
 import model as M

test/seeds.py

@@ -15,7 +15,7 @@
 
 _, repo_path, bindirs = get_srcrepobindirs()
 
-os.environ['PATH'] = os.pathsep.join([*os.environ['PATH'].split(os.pathsep), *bindirs])
+os.environ['PATH'] = os.pathsep.join([*bindirs, *os.environ['PATH'].split(os.pathsep)])
 
 sys.path.append(os.path.join(repo_path, "src", "gui"))
 import model as M

test/shiftby.py

@@ -13,7 +13,7 @@
 
 srcdir, repo_path, bindirs = get_srcrepobindirs()
 
-os.environ['PATH'] = os.pathsep.join([*os.environ['PATH'].split(os.pathsep), *bindirs])
+os.environ['PATH'] = os.pathsep.join([*bindirs, *os.environ['PATH'].split(os.pathsep)])
 
 os.makedirs(os.path.join(repo_path, "test", "scratch", "shiftby"))
 shutil.copy(os.path.join(repo_path, "configuration.py"),

test/tutorial.py

@@ -14,7 +14,7 @@
 
 _, repo_path, bindirs = get_srcrepobindirs()
 
-os.environ['PATH'] = os.pathsep.join([*os.environ['PATH'].split(os.pathsep), *bindirs])
+os.environ['PATH'] = os.pathsep.join([*bindirs, *os.environ['PATH'].split(os.pathsep)])
 
 sys.path.append(os.path.join(repo_path, "src", "gui"))
 import model as M

test/tutorial.sh

@@ -27,7 +27,7 @@ repo_path=$(dirname $testdir)
 bindir=$(dirname $repo_path)
 srcdir=${repo_path}/src
 
-PATH=$PATH:$bindir
+PATH=$bindir:$PATH
 
 mkdir -p $repo_path/test/scratch/tutorial-sh
 cp $repo_path/configuration.py $repo_path/test/scratch/tutorial-sh

test/visualization.py

@@ -16,7 +16,7 @@
 
 _, repo_path, bindirs = get_srcrepobindirs()
 
-os.environ['PATH'] = os.pathsep.join([*os.environ['PATH'].split(os.pathsep), *bindirs])
+os.environ['PATH'] = os.pathsep.join([*bindirs, *os.environ['PATH'].split(os.pathsep)])
 
 sys.path.append(os.path.join(repo_path, "src", "gui"))
 import model as M