Checks

Still check custom exe file is a Python interpreter of the right major version
HicServices · Nov 13, 2023 · e980012 · e980012
1 parent 2e142c3
commit e980012
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/LoadModules.Extensions.Tests/Python/Unit/Python2InstalledTests.cs b/LoadModules.Extensions.Tests/Python/Unit/Python2InstalledTests.cs
@@ -88,7 +88,7 @@ public void PythonScript_Timeout()
     [Test]
     public void PythonScript_OverrideExecutablePath_DodgyFileType()
     {
-        var MyPythonScript = @"s = raw_input ('==>')";
+        const string MyPythonScript = "s = raw_input ('==>')";
 
         var py = Path.Combine(TestContext.CurrentContext.WorkDirectory, "Myscript.py");
 
@@ -105,7 +105,7 @@ public void PythonScript_OverrideExecutablePath_DodgyFileType()
         //call with accept all
         var ex = Assert.Throws<Exception>(()=>provider.Check(new AcceptAllCheckNotifier()));
 
-        StringAssert.Contains(@"Myscript.py file is not called python.exe... what is going on here?",ex.Message);
+        StringAssert.Contains(@"Myscript.py file is not called python.exe... what is going on here?",ex?.Message);
     }
 
     [Test]

diff --git a/Python/LoadModules.Extensions.Python/DataProvider/PythonDataProvider.cs b/Python/LoadModules.Extensions.Python/DataProvider/PythonDataProvider.cs
@@ -13,7 +13,6 @@
 using Rdmp.Core.DataLoad;
 using Rdmp.Core.DataLoad.Engine.DataProvider;
 using Rdmp.Core.DataLoad.Engine.Job;
-using Rdmp.Core.ReusableLibraryCode.Annotations;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
 
@@ -73,9 +72,6 @@ public void Check(ICheckNotifier notifier)
         //make sure Python is installed
         try
         {
-            // If the override exe exists, trust it.
-            if (OverridePythonExecutablePath?.Exists == true) return;
-
             var version = GetPythonVersion();
 
             if (version?.StartsWith(GetExpectedPythonVersion(), StringComparison.Ordinal)==true)
@@ -149,6 +145,14 @@ public void Initialize(ILoadDirectory hicProjectDirectory, DiscoveredDatabase db
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
+        if (string.IsNullOrWhiteSpace(FullPathToPythonScriptToRun))
+        {
+            job.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error,
+                    "No Python script provided"));
+            return ExitCodeType.Error;
+        }
+
         int exitCode;
         try
         {