fix bug in results_suffix; renaming a shapefile.

Author: davemfish

src/natcap/invest/recreation/recmodel_client.py

@@ -774,9 +774,13 @@ def _retrieve_user_days(
         shutil.move(
             os.path.join(output_dir, f'{acronym_lookup[dataset]}_monthly_table.csv'),
             os.path.join(output_dir, renamed_table))
-        shutil.move(
-            os.path.join(output_dir, f'{acronym_lookup[dataset]}_results.shp'),
-            os.path.join(output_dir, renamed_vector))
+        driver = gdal.GetDriverByName('ESRI Shapefile')
+        source_path = os.path.join(
+            output_dir, f'{acronym_lookup[dataset]}_results.shp')
+        source = gdal.OpenEx(source_path, gdal.OF_VECTOR)
+        driver.CreateCopy(
+            os.path.join(output_dir, renamed_vector), source)
+        driver.Delete(source_path)
 
     LOGGER.info('connection release')
     recmodel_manager._pyroRelease()

tests/test_recreation.py

@@ -606,7 +606,7 @@ def test_all_metrics_local_server(self):
                 SAMPLE_DATA, 'predictors_all.csv'),
             'scenario_predictor_table_path': os.path.join(
                 SAMPLE_DATA, 'predictors_all.csv'),
-            'results_suffix': '',
+            'results_suffix': 'foo',
             'workspace_dir': self.workspace_dir,
             'hostname': self.hostname,
             'port': self.port,