Merge 234c42a into 6cd1a2d

dls-controls · Sep 18, 2020 · eeb0461 · eeb0461
2 parents 6cd1a2d + 234c42a
commit eeb0461
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/aa/fetcher.py b/aa/fetcher.py
@@ -62,9 +62,9 @@ def get_event_at(self, pv, instant, request_params=None):
         try:
             return self.get_values(pv, instant, instant, 1,
                                    request_params).get_event(0)
-        except IndexError:
+        except IndexError as e:
             error_msg = 'No data found for pv {} at timestamp {}'
-            raise ValueError(error_msg.format(pv, instant))
+            raise ValueError(error_msg.format(pv, instant)) from e
 
 
 class AaFetcher(Fetcher):

diff --git a/aa/rest.py b/aa/rest.py
@@ -99,6 +99,9 @@ def archive_pv(self, pv, samplingperiod, samplingmethod=aa.SCAN):
     def pause_archiving_pv(self, pv):
         return self._rest_get('pauseArchivingPV', pv=pv)
 
+    def resume_archiving_pv(self, pv):
+        return self._rest_get('resumeArchivingPV', pv=pv)
+
     def delete_pv(self, pv):
         return self._rest_get('deletePV', pv=pv)
 

diff --git a/test/test_rest.py b/test/test_rest.py
@@ -34,6 +34,7 @@ def test_AaRestClient_construct_url(kwargs, aa_client):
         ('getCurrentlyDisconnectedPVs', 'get_currently_disconnected_pvs', {}),
         ('archivePV', 'archive_pv', {'pv': 'dummy', 'samplingperiod': 10, 'samplingmethod': MONITOR}),
         ('pauseArchivingPV', 'pause_archiving_pv', {'pv': 'dummy'}),
+        ('resumeArchivingPV', 'resume_archiving_pv', {'pv': 'dummy'}),
         ('deletePV', 'delete_pv', {'pv': 'dummy'}),
         ('abortArchivingPV', 'abort_archiving_pv', {'pv': 'dummy'})
 ])