From c35dad7a567f3de0921972983e2ff6f639d8192a Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 8 Nov 2016 10:42:17 -0500 Subject: [PATCH] Fixed nodeodm tests --- app/fixtures/orthophoto.tif | Bin 193380 -> 195748 bytes nodeodm/external/node-OpenDroneMap | 2 +- nodeodm/tests.py | 8 +++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/fixtures/orthophoto.tif b/app/fixtures/orthophoto.tif index b7377797929929f518e2e7a5faea2e288ae91c6f..18bb1d2ec2a2051f5c7b62c67eaab07b05844eb0 100644 GIT binary patch delta 384 zcmYMuF>AtL5XSM#1>VKrM-atMg%+o7W)xfsLg^$<9XoXJ15{1PCUo)L#6jw)9VAN! zp}SRVSEu6W(in|#=wsk`r~7jpKkj#v8O9k^tzOdIv87&=HC5dB(+_hla>%b&1-p+? zE3g~t1(xNIDcf<#CZfk3Q`>V$p*{52w<(WS=!x%;g|49AeWo1xb{CYscw}*u!dnc$ z-ALz`fcFOeKnwhh7Wf`5a1SkTe;+(A&+s9I-8hBU2mQ1H92?j<8u$V&@EdLf-k=5E q#=&BBhLaTTV&LQJM9+QzCkC#c4BSKu9N|Xb8|(#kPr=}mJ?kHV+HJ%D delta 23 fcmZ4Tll#dtZZ=O(Ee4T~jcl!Kj9b~5;ywcaZi)zI diff --git a/nodeodm/external/node-OpenDroneMap b/nodeodm/external/node-OpenDroneMap index c056dee4..baef4f81 160000 --- a/nodeodm/external/node-OpenDroneMap +++ b/nodeodm/external/node-OpenDroneMap @@ -1 +1 @@ -Subproject commit c056dee4857066e4c3b65a9a3cbf1b5aa1282ac9 +Subproject commit baef4f817e1928090b522a2e871de0568377d043 diff --git a/nodeodm/tests.py b/nodeodm/tests.py index 6b0a9206..c6e46921 100644 --- a/nodeodm/tests.py +++ b/nodeodm/tests.py @@ -101,7 +101,7 @@ class TestClientApi(TestCase): res = api.new_task( glob.glob("nodeodm/fixtures/test_images/*.JPG"), "test", - [{'name': 'cmvs-maxImages', 'value': 5}]) + [{'name': 'force-ccd', 'value': 6.16}]) uuid = res['uuid'] self.assertTrue(uuid != None) @@ -114,7 +114,7 @@ class TestClientApi(TestCase): # Here we are waiting for the task to be completed wait_for_status(api, uuid, status_codes.COMPLETED, 10, "Could not download assets") asset = api.task_download(uuid, "all.zip") - self.assertTrue(isinstance(asset, requests.Response)) # Binary content, really + self.assertTrue(isinstance(asset, requests.Response)) # task_output self.assertTrue(isinstance(api.task_output(uuid, 0), list)) @@ -126,7 +126,9 @@ class TestClientApi(TestCase): self.assertTrue(online_node.restart_task(uuid)) self.assertRaises(ProcessingException, online_node.restart_task, "wrong-uuid") - # Can cancel task + wait_for_status(api, uuid, status_codes.COMPLETED, 10, "Could not restart task") + + # Can cancel task (should work even if we completed the task) self.assertTrue(online_node.cancel_task(uuid)) self.assertRaises(ProcessingException, online_node.cancel_task, "wrong-uuid")