# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1689843459 -7200
# Node ID 31ab8bb2ac5ae78175fc36b5e71fb5320c64a149
# Parent  3a5260cc6d55cd00ec2b8286caf8804c3e01e42b# Parent  e6cee85fe4215c5d68c89376d547d70a14cd77a3
merge

diff -r e6cee85fe421 -r 31ab8bb2ac5a .hgignore
--- a/.hgignore	Thu Jul 13 17:57:53 2023 +0200
+++ b/.hgignore	Thu Jul 20 10:57:39 2023 +0200
@@ -10,3 +10,4 @@
 *~
 NewTests/storages/**
 NewTests/configurations/*.json
+.env/
\ No newline at end of file
diff -r e6cee85fe421 -r 31ab8bb2ac5a Tests/Tests.py
--- a/Tests/Tests.py	Thu Jul 13 17:57:53 2023 +0200
+++ b/Tests/Tests.py	Thu Jul 20 10:57:39 2023 +0200
@@ -4823,7 +4823,25 @@
             DoDelete(_REMOTE, '/jobs/%s/archive' % job)
             # make sure it is not available anymore afterwards
             self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
-
+            # job is still available
+            DoGet(_REMOTE, '/jobs/%s' % job)
+
+            if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
+                # delete the job itself
+                DoDelete(_REMOTE, '/jobs/%s' % job)
+                self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/jobs/%s' % job))
+
+                # test deletion of jobs in history
+                job = MonitorJob2(_REMOTE, lambda: DoPost
+                                (_REMOTE, '/series/%s/archive' % kneeT2, {
+                                    'Synchronous' : False
+                                }))
+                z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
+                # delete the job itself
+                DoDelete(_REMOTE, '/jobs/%s' % job)
+                # make sure it is not available anymore afterwards (and its output is not available either)
+                self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/jobs/%s' % job))
+                self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
 
 
     def test_queries_hierarchy(self):