Unverified Commit a52dd386 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Cleaner jenkins (#5081) 

* Force msi2isis to use the correct temporary file facilities in ISIS

* Add back in app logic for isiscomplete

* Updates truth data for naifdskshape based on previous changes

* Updates truth data for msi2isis NN test

* Fixed mer clone path

* Fixed lronaccal tests and bug in lronaccal

* Added error throw in MissionData function if the file specified cannot be found

* Adds lronaccal test data

* Fixed isisimport tests overwritting test file

* Cleaned up isis download tests

* Fixed getsn issues

* Removed commented out line
parent a16bdf8b

isis/config/rclone.conf

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ remote = asc_s3:asc-isisdata/usgs_data/mariner10/ 


[mer_usgs]

type = alias

remote = asc_s3:asc-isisdata/usgs_data/mer_usgs/

remote = asc_s3:asc-isisdata/usgs_data/mer/



[messenger_naifKernels]

type = alias

isis/pytests/test_IsisDownload.py

+3 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ downloadIsisData = module_from_spec(spec) 
spec.loader.exec_module(downloadIsisData)

did = downloadIsisData



# from downloadIsisData import rclone, create_rclone_arguments



class MockedPopen:

    def __init__(self, args, **kwargs):

        self.args = args
@@ -58,9 +56,6 @@ def test_rclone_unknown_exception(): 


def test_create_rclone_args():

    with TemporaryDirectory() as tdir: 

        dest = Path(tdir) / "test"

        args = did.create_rclone_arguments(str(dest), "lro_naifKernels:", dry_run=False, ntransfers=100)

        assert args == ['lro_naifKernels:', str(dest/"lro"/"kernels"), '--progress', '--checkers=100', '--transfers=100', '--track-renames', '--log-level=WARNING']

        assert dest.exists()



        dest = Path(tdir)

        args = did.create_rclone_arguments(str(dest), "lro_naifKernels:", ntransfers=100, rclone_kwargs=["--dry_run"])

        assert args == ['lro_naifKernels:', str(dest/"lro"/"kernels"), '--progress', '--checkers=100', '--transfers=100', '--track-renames', '--log-level=WARNING', '--dry_run']

isis/src/base/apps/getsn/getsn.cpp

+6 −1
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ namespace Isis { 
      }

    }



    if (ui.IsInteractive()) {

      log->addLogGroup(sn);

    }

    else {

      log->addGroup(sn);

    }

  }

}

isis/src/base/apps/getsn/main.cpp

+0 −6
Original line number Diff line number Diff line
@@ -30,11 +30,5 @@ void IsisMain() { 
  getsn(ui, &appLog);



  PvlGroup results = appLog.findGroup("Results");



  if( ui.WasEntered("TO") && ui.IsInteractive() ) {

    Application::GuiLog(results);

  }



  SessionLog::TheLog().AddResults(results);

  

}

isis/src/base/objs/NaifDskShape/NaifDskShape.truth

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Intersection successful? "No" 
Construct NaifDskShape object from cube labels with ShapeModel=DSK file.

Try to intersect surface at obsPos (0,0,1000) and lookDir (0,-1,-1)

Intersection successful?      "No"

Try to intersect surface at obsPos (1000,0,0) and lookDir (-1,0,0)

Try to intersect surface at obsPos (1000,0,0) and ground point (1,0,0)

Intercept X =  0.28911

Intercept Y =  0

Intercept Z =  0