trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,883 Commits 19 Branches 14 Tags 7.2 MiB
Commit Graph

745 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 6dd54d9645 deactivate devices 2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas dc3b9ebf2d fixing test 2021-10-05 11:55:43 +02:00
Cayo Puigdefabregas 83c4cc2d8b test of delete devices 2021-10-05 09:56:57 +02:00
Cayo Puigdefabregas b02f9dfac5 fixing test bug #168 2021-10-04 13:34:49 +02:00
Cayo Puigdefabregas b83bbe25a0 test bug 168 2021-10-01 18:01:39 +02:00
Cayo Puigdefabregas 2d305f5a43 adding trade without devices 2021-10-01 13:18:56 +02:00
Cayo Puigdefabregas 2790a7756c test action trade without devices and documents 2021-10-01 12:56:12 +02:00
Cayo Puigdefabregas 7a43eaa30f fixing name reuse in test 2021-10-01 11:42:31 +02:00
Cayo Puigdefabregas e30c6c2250 fixing test 2021-10-01 11:26:56 +02:00
Cayo Puigdefabregas eeb6db7bc2 test for recycling documents 2021-09-29 21:12:46 +02:00
Cayo Puigdefabregas 7e4af161d3 solve conflict 2021-09-29 14:13:42 +02:00
cayop baa5fccda0
Merge pull request #163 from eReuse/feature/container 
Feature/container
 2021-09-29 12:58:01 +02:00
Cayo Puigdefabregas 2828c0755a adding test for check if you are not the owner 2021-09-29 11:04:56 +02:00
Cayo Puigdefabregas 88780d4949 adding test for history and status calls 2021-09-28 15:44:56 +02:00
Cayo Puigdefabregas 4ce316a9ac fixing tests status actions 2021-09-28 11:25:57 +02:00
Cayo Puigdefabregas e861ae3bf8 adding tests for recycling and reuse 2021-09-22 14:33:46 +02:00
Cayo Puigdefabregas 23cb5a2bf6 fixing test 2021-09-22 12:18:10 +02:00
Cayo Puigdefabregas b7396b4f23 adding action moveOn inside of tradeDocuments 2021-09-09 13:34:24 +02:00
Cayo Puigdefabregas 1e86515391 fixing test moveOnDocument 2021-09-08 14:17:48 +02:00
Cayo Puigdefabregas 74af5add3c adding action moveOn endpoint 2021-09-06 12:45:47 +02:00
Cayo Puigdefabregas f398c50288 clean old code as documents 2021-09-06 12:44:57 +02:00
Cayo Puigdefabregas 1aaf0a9ae7 build tests for moveon 2021-09-03 16:05:55 +02:00
Cayo Puigdefabregas 1d73a8f0c1 Merge branch 'testing' into feature/container 2021-09-03 11:05:47 +02:00
Cayo Puigdefabregas fdea06f08f specific test for unassign 2021-08-17 11:22:50 +02:00
Cayo Puigdefabregas 3e232e40c7 base of test unassign 2021-08-17 11:06:04 +02:00
Cayo Puigdefabregas e82358d5dc fixing basic test 2021-08-10 13:21:39 +02:00
Cayo Puigdefabregas f1220dd756 new Recycling document 2021-08-10 12:45:03 +02:00
Cayo Puigdefabregas 9217f7392a Merge branch 'feature/document-erased' into feature/container 2021-08-09 17:22:46 +02:00
Cayo Puigdefabregas 9b2936c795 adding weight to trade documents 2021-08-03 16:40:17 +02:00
Cayo Puigdefabregas 2263f67419 test 2021-08-03 13:08:03 +02:00
Cayo Puigdefabregas 7f0ea2d9ae new test for trade document 2021-08-03 11:28:18 +02:00
Cayo Puigdefabregas 8aba022ef5 fixing test 2021-08-02 11:42:33 +02:00
Cayo Puigdefabregas e0c8d0204c fixing tests csv exports 2021-08-02 10:46:35 +02:00
Cayo Puigdefabregas 1811b81e93 adding success and software field in document 2021-07-29 14:54:58 +02:00
Cayo Puigdefabregas bfe56a8626 DataWipe instead of ToErased 2021-07-29 12:45:43 +02:00
Cayo Puigdefabregas f8ce81cc19 drop endpoint 2021-07-29 11:19:45 +02:00
Cayo Puigdefabregas bb3145f3d8 fixing test_basic 2021-07-28 15:59:11 +02:00
Cayo Puigdefabregas 1e32b74b8f fixing test basics 2021-07-26 14:00:28 +02:00
Cayo Puigdefabregas 5e6ecaae49 adding test for erase documents 2021-07-26 11:55:12 +02:00
Cayo Puigdefabregas fb4f6f9386 adding test for erase documents 2021-07-26 11:54:05 +02:00
Cayo Puigdefabregas 0d033e94d4 Merge branch 'testing' into feature/document-erased 2021-07-13 10:45:57 +02:00
Cayo Puigdefabregas c2745fa437 update changelog and versions 2021-07-07 12:46:24 +02:00
Cayo Puigdefabregas 64ef1dcf57 test erase from web 2021-07-06 16:03:03 +02:00
Cayo Puigdefabregas c554d30291 fixing tests 2021-07-05 15:04:44 +02:00
Cayo Puigdefabregas 56078dbd8a fixing tests snapshots 2021-07-05 12:31:43 +02:00
Cayo Puigdefabregas 57007b3d92 fixing test for jwt in snapshots 2021-07-02 17:40:20 +02:00
Cayo Puigdefabregas 3d027270cc ading jwt in snapshots 2021-07-02 15:25:19 +02:00
Cayo Puigdefabregas 167f16b641 Merge branch 'testing' into feature/#155_decode_snapshots 2021-07-01 12:57:08 +02:00
Cayo Puigdefabregas 8cc535273a drop old trade tests 2021-07-01 12:16:49 +02:00
Cayo Puigdefabregas c5234e0fd4 fixing tests 2021-07-01 12:07:52 +02:00
nad 6d4212f314 add example snapshot with hash 2021-06-30 12:47:26 +02:00
nad e3a0ea7e5b first iteration #155 decode snapshot json 2021-06-29 17:15:45 +02:00
Cayo Puigdefabregas 7cee2693ff resolve conflict 2021-06-15 11:22:17 +02:00
Cayo Puigdefabregas 0d4c70a74e fixing bug 2021-06-11 15:49:31 +02:00
Cayo Puigdefabregas ab32b996bd resolve conflict 2021-06-11 12:52:39 +02:00
Cayo Puigdefabregas 5f7dfbe58e adding 14 cases of trade tests 2021-06-11 12:25:58 +02:00
cayop a0d26a104f
Merge pull request #140 from eReuse/feature/endpoint-confirm 
Feature/endpoint confirm
 2021-06-09 11:46:32 +02:00
Cayo Puigdefabregas 0f744d5eb7 fixing tests 2021-06-09 11:27:12 +02:00
Cayo Puigdefabregas f3f65efeaf resolve conflicts 2021-06-07 12:08:55 +02:00
Cayo Puigdefabregas 6c689878a4 Fixing schema trade 2021-06-01 15:59:54 +02:00
Cayo Puigdefabregas f8944df312 fixed tests 2021-05-27 15:55:39 +02:00
Cayo Puigdefabregas 30ad463d1e fixing documents 2021-05-26 11:42:42 +02:00
Cayo Puigdefabregas 5e97cdf863 less fixing tests 2021-05-25 11:35:03 +02:00
Cayo Puigdefabregas 1098ef773f resolve conflict 2021-05-25 09:03:34 +02:00
Cayo Puigdefabregas 74dd300cad finish tests 2021-05-21 13:16:06 +02:00
Cayo Puigdefabregas 443464c9b8 trade test for documents 2021-05-19 13:58:39 +02:00
Cayo Puigdefabregas 3b8b14cfba fixing test endpoint docs 2021-05-19 09:45:01 +02:00
Cayo Puigdefabregas 6fc0e71833 new endpoint tests of tradedocuments 2021-05-14 12:57:54 +02:00
Cayo Puigdefabregas 5e36cca340 basic test of model Document 2021-05-13 18:41:20 +02:00
Cayo Puigdefabregas c21de78982 base for documents 2021-05-13 13:35:46 +02:00
Cayo Puigdefabregas 821178359e resolve conflicts 2021-05-12 19:06:03 +02:00
Cayo Puigdefabregas a1119b6130 Merge branch 'testing' into feature/endpoint-confirm 2021-05-12 18:52:50 +02:00
Cayo Puigdefabregas 5b6073de7e adding test about this bug 2021-05-12 12:24:22 +02:00
Cayo Puigdefabregas 90f3a097a0 split trade tests in an other file 2021-05-12 11:47:40 +02:00
Cayo Puigdefabregas f36fa2bb7d add var in config 2021-05-12 11:47:03 +02:00
Cayo Puigdefabregas f6205912fb fixing test renders 2021-05-10 12:10:57 +02:00
Cayo Puigdefabregas 3157c34ab8 adding tests for moviestar usecases 2021-05-10 11:53:31 +02:00
Cayo Puigdefabregas 882ee381b3 fixing tests 2021-05-10 11:52:43 +02:00
Cayo Puigdefabregas 951d067dd6 adding revoke and fixing ConfigRevike 2021-04-30 17:54:03 +02:00
Cayo Puigdefabregas 34fbf0dca6 ConfirmRevoke as a new action 2021-04-30 12:44:32 +02:00
Cayo Puigdefabregas b2bd820d50 resolve conflict 2021-04-29 17:04:25 +02:00
Cayo Puigdefabregas e4b1fc0eec drop test tradenotes 2021-04-29 11:48:53 +02:00
Cayo Puigdefabregas 4afa21d7d7 Merge branch 'testing' into feature/#135-trade-without-to 2021-04-29 11:23:00 +02:00
Cayo Puigdefabregas 330f2b7b78 test revoke and confirm with doble query 2021-04-27 10:53:19 +02:00
Cayo Puigdefabregas 97d784f849 Merge branch 'testing' into feature/endpoint-confirm 2021-04-26 17:11:35 +02:00
Cayo Puigdefabregas e496f8009c replicate bug in test 2021-04-26 15:22:09 +02:00
Cayo Puigdefabregas 2557cee84a adding tests confirm and revoke 2021-04-22 11:10:49 +02:00
Cayo Puigdefabregas d71d978936 update get one action 2021-04-21 17:39:02 +02:00
Cayo Puigdefabregas dfd4ffe012 new test for tradenote 2021-04-21 14:44:34 +02:00
Cayo Puigdefabregas da4a410f58 fixing render tests 2021-04-21 14:42:44 +02:00
Cayo Puigdefabregas a0981d1430 adding test_automatic_note_to_trade 2021-04-20 16:20:24 +02:00
Cayo Puigdefabregas 220e864681 fixing test 2021-04-20 16:19:55 +02:00
Cayo Puigdefabregas aaafb2a5fa test about trade notes 2021-04-19 21:31:22 +02:00
Cayo Puigdefabregas fa4edfb9a2 fixing tests 2021-04-19 19:33:55 +02:00
Cayo Puigdefabregas 149255bcfe resolve conflicts 2021-04-16 18:16:07 +02:00
Cayo Puigdefabregas e9d85e3d9e resolv conflict 2021-04-16 15:46:19 +02:00
Cayo Puigdefabregas ebe089499d fixing tests 2021-04-16 13:25:41 +02:00
Cayo Puigdefabregas 4122ac165e fixing tests 2021-04-16 12:45:14 +02:00
Cayo Puigdefabregas 68ffa0ddff fixing tests 2021-04-16 11:14:36 +02:00
Cayo Puigdefabregas 7836f2fc8d drop pdbs 2021-04-15 21:23:02 +02:00
Cayo Puigdefabregas 9c489c7564 fixing create new users 2021-04-15 21:16:32 +02:00
Cayo Puigdefabregas 5cc64d2d28 fixing test 2021-04-15 21:16:04 +02:00
Cayo Puigdefabregas 7ea3041aa0 authorized up snapshots with new token 2021-04-14 13:21:46 +02:00
Cayo Puigdefabregas d46db11813 adding devices from lot 2021-04-14 13:02:39 +02:00
Cayo Puigdefabregas ca85a1f221 check the token in a test 2021-04-13 18:34:18 +02:00
Cayo Puigdefabregas 7e4513f5d2 Merge branch 'testing' into feature/#128-endpoint-config-wb 2021-04-12 19:48:23 +02:00
Cayo Puigdefabregas 1620591deb fixing test_get_wbconf 2021-04-12 12:31:07 +02:00
Cayo Puigdefabregas 0138162bdf enlarge test of phantom account and components 2021-04-09 22:22:39 +02:00
Cayo Puigdefabregas affeea4f52 check trade.confirm_transfer 2021-04-09 20:11:43 +02:00
Cayo Puigdefabregas 4157aa8273 adding test of active and phantom login 2021-04-09 20:10:52 +02:00
Cayo Puigdefabregas ac5b55d04a new trade tests 2021-04-08 19:10:08 +02:00
Cayo Puigdefabregas 054f59453d fixing tests 2021-04-08 19:09:52 +02:00
Cayo Puigdefabregas 9a48ea09a4 test offers 2021-04-07 10:49:05 +02:00
Cayo Puigdefabregas 1d6e0c9588 fixing test offer 2021-04-03 17:46:40 +02:00
Cayo Puigdefabregas bbc22f4a53 Merge branch 'testing' into feature/trade-without-from 2021-04-03 15:02:06 +02:00
Cayo Puigdefabregas ee55020f3c resolve conflict 2021-03-26 11:04:04 +01:00
Cayo Puigdefabregas 335c53530e fixing test 2021-03-25 11:39:52 +01:00
Cayo Puigdefabregas 45b44ce17b fixing tests 2021-03-25 11:26:30 +01:00
Cayo Puigdefabregas 4a16091b04 Merge branch 'testing' into feature/#126-named-system-tags 2021-03-24 14:19:59 +01:00
Cayo Puigdefabregas e884ced4d1 try define offer 2021-03-24 14:17:18 +01:00
Cayo Puigdefabregas a66ddc8390 bugfix trade action 2021-03-18 16:36:19 +01:00
Cayo Puigdefabregas 9bd787c924 change test 2021-03-18 10:59:09 +01:00
Cayo Puigdefabregas 5cd140296f test_trade 2021-03-17 18:17:43 +01:00
Cayo Puigdefabregas 0706aab3b7 test for a simple trade 2021-03-17 10:44:58 +01:00
Cayo Puigdefabregas 2ee71def75 clean pdbs 2021-03-16 20:53:54 +01:00
Cayo Puigdefabregas b13d8e5b97 fixing merge 2021-03-16 20:50:57 +01:00
Cayo Puigdefabregas 10733f8889 fixing test unamed 2021-03-16 20:05:08 +01:00
Cayo Puigdefabregas f9281fbdc0 Merge branch 'testing' into feature/#126-named-system-tags 2021-03-16 20:01:55 +01:00
Cayo Puigdefabregas 2b60af8b08 fixing tests and property url of device 2021-03-09 12:54:57 +01:00
Cayo Puigdefabregas b83563e0ea swap SystemID for DevicehubID 2021-03-08 22:43:24 +01:00
Cayo Puigdefabregas f331128741 adding TagCode to tag named system 2021-03-08 12:39:17 +01:00
Cayo Puigdefabregas 6bb608b1a6 resolve confict 2021-03-04 10:51:20 +01:00
Cayo Puigdefabregas 7dc88369a4 adding logout in test_base 2021-03-02 21:53:15 +01:00
Cayo Puigdefabregas f9ef240749 adding endpoint to test_basic 2021-03-02 11:46:13 +01:00
Cayo Puigdefabregas 0d0005b315 adding file env for download 2021-03-02 11:42:07 +01:00
Cayo Puigdefabregas adb9a8e25a basic endpoint for wbconf 2021-03-01 19:21:57 +01:00
Cayo Puigdefabregas a73dee8992 add test for liink and unlink device to one tag 2021-03-01 18:55:44 +01:00
Cayo Puigdefabregas b811e0572c delete tags named 2021-03-01 17:56:55 +01:00
Cayo Puigdefabregas b2859781f0 new tests and fixing others 2021-02-26 18:59:57 +01:00
Cayo Puigdefabregas 689d0c48c8 change the model of tags from org to user 2021-02-26 11:28:32 +01:00
Cayo Puigdefabregas e85b40c90f Fixing test stock 2021-02-22 22:08:14 +01:00
Cayo Puigdefabregas 7552839f9c updating test for internal stats 2021-02-22 21:17:07 +01:00
Cayo Puigdefabregas 30005e1f91 remove pdbs 2021-02-22 21:16:32 +01:00
Cayo Puigdefabregas d956271908 adding EMAIL_ADMIN to test config 2021-02-22 21:15:25 +01:00
Cayo Puigdefabregas da6cd547ed clean pdbs 2021-02-22 10:13:10 +01:00
Cayo Puigdefabregas ce4dce055d basic endpoint for internal stats 2021-02-19 12:53:42 +01:00
Cayo Puigdefabregas 1cf3c61db5 adding test for verify all documents 2021-02-18 11:37:37 +01:00
Cayo Puigdefabregas 32c4844aed adding test for verify stamp 2021-02-17 23:14:40 +01:00
Cayo Puigdefabregas 39fcbd24b7 adding mobil test file 2021-02-15 13:23:04 +01:00
Cayo Puigdefabregas 0d899d1e6a adding mobil snapshot 2021-02-15 12:37:18 +01:00
Cayo Puigdefabregas aa5fb1d9fd fixing basic tests 2021-02-11 21:04:18 +01:00
Cayo Puigdefabregas 91848a548c deactivate manual merge 2021-02-11 20:38:18 +01:00
Cayo Puigdefabregas bf734ee534 fixing testing deliverynote 2021-02-11 13:17:52 +01:00
Cayo Puigdefabregas 0535a1f310 resolve conflict 2021-02-11 13:03:21 +01:00
Cayo Puigdefabregas afa4f9ce45 fixing tests 2021-02-10 13:40:24 +01:00
Cayo Puigdefabregas d24a0ca16b fixing tests 2021-02-10 11:01:12 +01:00
Cayo Puigdefabregas 1a0287f8f9 adding documentId in csv of devices report 2021-02-07 18:16:43 +01:00
Cayo Puigdefabregas cb3f07eb5a change deposit for amount 2021-02-05 13:21:20 +01:00
Cayo Puigdefabregas 761e70b5e6 simple test of deliverynote 2021-02-04 20:43:57 +01:00
Cayo Puigdefabregas 2619f88a9f drop all proof 2021-02-04 13:50:00 +01:00
Cayo Puigdefabregas fe824cc4fa drop deliverynote_address 2021-02-04 13:06:51 +01:00
Cayo Puigdefabregas 95f04094c7 fixing problem in live test2 2021-02-04 12:51:51 +01:00
Cayo Puigdefabregas a716e95792 fixing problem in live test 2021-02-04 12:23:28 +01:00
Cayo Puigdefabregas fd7920b3f9 fixed test 2021-01-26 15:35:42 +01:00
Cayo Puigdefabregas 1e50386b93 fixed test 2021-01-25 16:10:23 +01:00
Cayo Puigdefabregas c3b860b69c test reproduce bug 1888 2021-01-25 15:38:09 +01:00
Cayo Puigdefabregas 47b7b4224c test and fixed bug 1860 2021-01-22 13:19:29 +01:00
Cayo Puigdefabregas 14a27a3d85 bug fix change smallint for integer 2021-01-21 17:13:36 +01:00
Cayo Puigdefabregas 8820395211 add asserts to test 2021-01-21 12:32:55 +01:00
Cayo Puigdefabregas ff77e3b065 reproduce bug in a test 2021-01-21 12:25:38 +01:00
Cayo Puigdefabregas 5ae61d30bc adding systemId in metrics csv 2021-01-20 10:39:02 +01:00
Cayo Puigdefabregas 7f6014532d fixing test 2021-01-19 16:31:01 +01:00
Cayo Puigdefabregas f140c48359 fixing bug of lifetime 2021-01-19 16:06:46 +01:00
Cayo Puigdefabregas 1ec1eb39bf fixing test base 2021-01-18 12:40:31 +01:00
Cayo Puigdefabregas d974d3d78f ereuse_devicehub/resources/action/models.py 2021-01-14 17:32:03 +01:00
Cayo Puigdefabregas 810a9b360c adding new endpoit for download csv of metrics 2021-01-08 17:37:52 +01:00
Cayo Puigdefabregas 245549336a fixing bug of 2 users with the same device and launch one live 2021-01-08 10:46:34 +01:00
Cayo Puigdefabregas e9a5cfe2f1 fixing bug for live snapshot 2021-01-04 15:53:58 +01:00
Cayo Puigdefabregas 6cad31eaf3 fixing metrics 2020-12-29 19:54:00 +01:00
Cayo Puigdefabregas 56f134bd18 adding endpoints to render test 2020-12-29 19:03:36 +01:00
Cayo Puigdefabregas 2d4c4d4c89 adding endpoint licences 2020-12-29 17:37:13 +01:00
Cayo Puigdefabregas 676cfe96d8 new endpoint live 2020-12-28 18:02:47 +01:00
Cayo Puigdefabregas 9ca23a51a2 search bug 2020-12-28 17:45:21 +01:00
Cayo Puigdefabregas b3573f31eb change endpoint live 2020-12-28 15:31:57 +01:00
Cayo Puigdefabregas 96540d701c fixing lineterminator in csv 2020-12-21 16:09:30 +01:00
Cayo Puigdefabregas d89dbe8c29 fixing tests 2020-12-21 13:53:48 +01:00
Cayo Puigdefabregas 3c12d1f75c add endpoint 2020-12-21 13:40:07 +01:00
Cayo Puigdefabregas db610d2853 insert hash3 when document is download 2020-12-21 11:34:03 +01:00
Cayo Puigdefabregas 5241c73a98 not required chassis in all system 2020-12-17 10:45:01 +01:00
Cayo Puigdefabregas aef220a5dc chassis not required 2020-12-16 22:05:33 +01:00
Cayo Puigdefabregas 2e11a9f28f resolve conflict CHANGELOG 2020-12-10 11:13:12 +01:00
Cayo Puigdefabregas 51d0bd0cc0 Merge branch 'testing' into bugfix/88-action-end_time 2020-12-10 10:54:11 +01:00
Cayo Puigdefabregas 729281383e resolve conflicts 2020-12-10 10:30:50 +01:00
Cayo Puigdefabregas 2c67e3be93 resolve conflict 2020-12-09 12:32:00 +01:00
Cayo Puigdefabregas 30ef4e594f fixing test 2020-12-09 12:06:43 +01:00
Cayo Puigdefabregas 4a147a50b7 fixing test 2020-12-09 12:05:22 +01:00
Cayo Puigdefabregas 68a8f70de4 resolve conflict 2020-12-09 11:29:10 +01:00
Cayo Puigdefabregas eaa20b4302 fixing conflict merge with testing 2020-12-09 11:12:47 +01:00
Cayo Puigdefabregas e2446c5001 Merge branch 'testing' into bugfix/89-snapshots-in-hdd 2020-12-09 10:11:45 +01:00
Cayo Puigdefabregas 2a57c436bd fixed comment in debug 2020-12-05 20:22:38 +01:00
Cayo Puigdefabregas 7e41c66073 implementing the warnings and unnormal cases 2020-12-04 16:58:53 +01:00
Cayo Puigdefabregas 8a508ebc0e modify live action 2020-12-02 12:53:15 +01:00
Cayo Puigdefabregas 4d9420d1e9 adding final user and timings as property instead of insert this datas in the database 2020-12-01 22:03:15 +01:00
Cayo Puigdefabregas 92c403579b ading finalUserCode to allocate action 2020-12-01 15:33:49 +01:00
Cayo Puigdefabregas b8a7a993ab adding snapshot file for test 2020-11-30 21:42:42 +01:00
Cayo Puigdefabregas 11c1363d04 fixing tests 2020-11-30 21:18:24 +01:00
Cayo Puigdefabregas 7c1c8060c5 test playing the bug 2020-11-30 10:48:48 +01:00
Cayo Puigdefabregas 517007ef50 fixing test 2020-11-28 19:04:54 +01:00
Cayo Puigdefabregas 2fd0c61cc3 adding test for reproduce the bug 2020-11-28 18:35:53 +01:00
Cayo Puigdefabregas bcb3358af3 fixed tests 2020-11-27 19:14:29 +01:00
Cayo Puigdefabregas 23e124721c fixing metrics 2020-11-26 19:21:35 +01:00
Cayo Puigdefabregas daeae1b4b4 fixed deallocate code bug 2020-11-26 19:08:07 +01:00
Cayo Puigdefabregas 988f5c1751 fixed dates 2020-11-26 18:51:36 +01:00
Cayo Puigdefabregas b072bc3b57 change allocate and deallocate 2020-11-26 18:44:08 +01:00
Cayo Puigdefabregas ef563e3595 resolve confict 2020-11-25 19:09:24 +01:00
Cayo Puigdefabregas 0c1e5b8307 changes from review 2020-11-25 18:42:36 +01:00
Cayo Puigdefabregas 2ed3e3f77f fixing LookupError of metrics 2020-11-25 17:46:58 +01:00
Cayo Puigdefabregas 821656ffc8 fixed new version of metrics for second_hdd test 2020-11-25 15:55:47 +01:00
Cayo Puigdefabregas 4657a3bcf9 clean metrics 2020-11-25 13:58:32 +01:00
Cayo Puigdefabregas 413ce7d76c adding metrics 2020-11-24 21:15:49 +01:00
Cayo Puigdefabregas fd1efb8715 fixed test_basic 2020-11-24 16:12:59 +01:00
Cayo Puigdefabregas 87704db271 adding live into snapshot and adding test 2020-11-24 13:44:49 +01:00
Cayo Puigdefabregas a664b8cc6c adding metrics in test_basic 2020-11-23 18:34:44 +01:00
Cayo Puigdefabregas 19d0410e74 bugfix 2020-11-23 18:08:40 +01:00
Cayo Puigdefabregas 60579437bb resolve conflict 2020-11-23 16:32:06 +01:00
Cayo Puigdefabregas 6ae0218a1f adding tests for allocate and deallocate 2020-11-23 15:55:24 +01:00
Cayo Puigdefabregas 73716a7331 fixing tests 2020-11-23 11:43:30 +01:00
Cayo Puigdefabregas fcfd2f549d fixed bug in test 2020-11-13 13:05:25 +01:00
Cayo Puigdefabregas 34be1df7a2 fixed bug in test 2020-11-13 12:48:44 +01:00
Cayo Puigdefabregas 62e52f145f fixed bug in test 2020-11-13 12:44:20 +01:00
Cayo Puigdefabregas 2587b365e3 test for requirements of new hid 2020-11-13 12:29:37 +01:00
Cayo Puigdefabregas 0883b4384a bugfix test workbench 2020-11-13 11:11:35 +01:00
Cayo Puigdefabregas b56c3d3e0a fixed some tests 2020-11-12 21:00:33 +01:00
Cayo Puigdefabregas 86f37d0cf1 test of merge 2 devices with 2 diferents tags one for device 2020-11-09 16:32:06 +01:00
Cayo Puigdefabregas 725e586e85 Merge branch 'testing' into bugfix/79-manual-merge 2020-11-09 16:11:12 +01:00
Cayo Puigdefabregas fb899b558f Merge branch 'testing' into feature/77-add-owner-device 2020-11-06 21:26:43 +01:00
Cayo Puigdefabregas 2055af222d checking if 2 users find the same computer but registered 2 times 2020-11-06 21:01:29 +01:00
Cayo Puigdefabregas bc5cbb2eff same computer saved from diferents users 2020-11-06 20:48:09 +01:00
Cayo Puigdefabregas bc923d5576 fixed test for check with owners 2020-11-06 17:14:16 +01:00
Cayo Puigdefabregas af9fe2d6b6 fixing tests 2020-11-05 16:31:57 +01:00
Cayo Puigdefabregas abe7783b93 fixed tests_devices 2020-11-03 20:26:32 +01:00
Cayo Puigdefabregas 19eca48db0 resolve conflict 2020-10-29 19:19:33 +01:00
cayop f7f7432c4e
Merge pull request #81 from eReuse/bugfix/74-json-backup-time-in-name 
Bugfix/74 json backup time in name
 2020-10-29 19:08:31 +01:00
Cayo Puigdefabregas 2dbcd2e7e2 add the snapshot file for test of debug 2020-10-29 17:50:52 +01:00
Cayo Puigdefabregas ed32f691f7 fixing test for new structure and adding debug test 2020-10-29 16:09:38 +01:00
cayop 6d4a7e7abb
Merge pull request #72 from eReuse/bugfix/64-bug-updated-date 
Bugfix/64 bug updated date
 2020-10-29 13:23:58 +01:00
Cayo Puigdefabregas 785d8091ea adding new test for check the debug file 2020-10-29 12:39:11 +01:00
Cayo Puigdefabregas 954dfa95a1 check in test this bug about time in the filename 2020-10-29 11:59:53 +01:00
Cayo Puigdefabregas 5717743d2f bug for moving tags 2020-10-28 22:15:04 +01:00
Cayo Puigdefabregas 3af8880bcd fixed endpoints of basic test 2020-10-28 21:57:24 +01:00
Jordi Nadeu 25f3cdb172
Merge pull request #71 from eReuse/bugfix/69-ereuseprice-computer-type 
Bugfix/69 ereuseprice computer type
 2020-10-28 17:59:37 +01:00
Cayo Puigdefabregas 0106728e4f complet test for basic manual merge 2020-10-28 13:29:45 +01:00
Cayo Puigdefabregas 889ee84f6a base of test merge 2020-10-27 19:14:23 +01:00
Jordi Nadeu 5c6803a467
Update proposal_extended_csv_report.csv 2020-10-22 17:15:14 +02:00
Jordi Nadeu 95bea41f02
Update complete.export.snapshot.yaml 
Change endTime EraseSectors to make sense
 2020-10-22 16:57:42 +02:00
Cayo Puigdefabregas 4847bdd19d change test for new csv 2020-10-22 15:54:42 +02:00
Cayo Puigdefabregas 216e748594 fixed test 2020-10-21 23:18:53 +02:00
Cayo Puigdefabregas a7c5460925 fixed test 2020-10-21 23:11:13 +02:00
Cayo Puigdefabregas 0a447ad816 fixed test 2020-10-21 23:04:49 +02:00
Cayo Puigdefabregas 1b772af374 fixed test 2020-10-21 22:56:57 +02:00
Cayo Puigdefabregas ef4c6af5ae fixed test 2020-10-21 22:48:40 +02:00
Cayo Puigdefabregas c23c16eee8 fixing test basic 2020-10-21 22:33:58 +02:00
Cayo Puigdefabregas fef2701ae3 add files for the test 2020-10-21 22:08:20 +02:00
Cayo Puigdefabregas 4ec0149375 add asserts to test 2020-10-21 22:07:56 +02:00
Cayo Puigdefabregas 2bababd69f fixing test 2020-10-21 13:05:28 +02:00
Cayo Puigdefabregas 10843b907d adding test 2020-10-19 13:06:54 +02:00
Cayo Puigdefabregas 0c5897a06c fixed test of devices 2020-10-16 16:42:43 +02:00
Cayo Puigdefabregas 3988079b01 drop pdb 2020-10-16 16:32:16 +02:00
Cayo Puigdefabregas e00c3f576c document new function 2020-10-16 16:31:54 +02:00
Cayo Puigdefabregas 7313f7cf73 fixed test 2020-10-16 16:26:37 +02:00
Cayo Puigdefabregas 139c1e290a resolve conflict 2020-10-16 15:12:21 +02:00
Cayo Puigdefabregas 76806299cd update devices when there are a new action 2020-10-16 15:08:54 +02:00
nad 75b5a4a710 Adding test and fix for Issue 69 EreusePrice Computer type 2020-10-15 13:19:47 +02:00
nad a7c3ea7317 Adding workbench file for Issue 69 EreusePrice Computer type 2020-10-15 13:18:51 +02:00
Cayo Puigdefabregas 79b4c738e9 change the name of the file 2020-10-15 11:00:11 +02:00
Cayo Puigdefabregas e4cf093b4b test of case when the time mark need to be updated 2020-10-14 13:41:28 +02:00
Cayo Puigdefabregas 150c73779d adding new tests of snapshots 2020-10-14 11:40:33 +02:00
Cayo Puigdefabregas d3ef6cc65d add user to the name file of json and more readable date 2020-10-13 15:59:39 +02:00
Cayo Puigdefabregas ae98d3154c TMP_SNAPSHOTS defined in config file 2020-10-13 15:37:21 +02:00
Cayo Puigdefabregas 49668a4f4f open files using with statement 2020-10-09 20:54:12 +02:00
Cayo Puigdefabregas 99a12b2b22 bugfix 2020-10-09 20:40:22 +02:00
Cayo Puigdefabregas 2a53e1672c using os.path.join instead of format 2020-10-09 20:29:02 +02:00
Cayo Puigdefabregas 3b93012584 fixing test with a bad snapshot 2020-10-08 14:48:22 +02:00
Cayo Puigdefabregas e36256ee72 clean test 2020-10-07 19:28:52 +02:00
Cayo Puigdefabregas 420b7ad4ab adding test_save_snapshot_in_file 2020-10-07 19:05:52 +02:00
Cayo Puigdefabregas 236806466a test backup snapshot 2020-10-07 18:28:07 +02:00
Cayo Puigdefabregas e6b2a92f7f base of the test with out serial number 2020-10-07 12:57:14 +02:00
Cayo Puigdefabregas cac9206dc9 resolve confict 2020-09-30 09:30:17 +02:00
Cayo Puigdefabregas c6500b9ae6 move the test in the specific files 2020-09-22 12:52:15 +02:00
Cayo Puigdefabregas fed6b57bbe import __version__ instead of open file __init__ 2020-09-22 11:57:39 +02:00
Cayo Puigdefabregas 66f963e90e bugfix adding re in test 2020-09-21 11:48:48 +02:00
Cayo Puigdefabregas 7f9be17c92 change pkg_resources for open __init__ in test too 2020-09-21 11:46:02 +02:00
Cayo Puigdefabregas 773bf3a200 fixing test_basic 2020-09-21 11:14:50 +02:00
Cayo Puigdefabregas aaaf118028 adding test of get version 2020-09-18 11:32:20 +02:00
Jordi Nadeu 927594f7a7
Merge pull request #50 from eReuse/feature/endpoints 
Adding basic tests endpoints
 2020-08-25 10:25:04 +02:00
nad b61398ee59 Adding two users on test_get_document_lots to check lot permissions 2020-08-18 21:02:47 +02:00
nad 1fccea2bcc Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description 
# Conflicts:
#	ereuse_devicehub/resources/documents/documents.py
#	tests/test_documents.py
 2020-08-18 19:31:43 +02:00
nad 6087044a5e Fixing test_get_multiple_lots and test_api_docs 2020-08-18 19:19:18 +02:00
Cayo Puigdefabregas a2b2be77f4 fixing get_device permissions 2020-08-18 12:35:04 +02:00
Cayo Puigdefabregas 3e653ee190 Merge branch 'testing' into feature/endpoints 2020-08-18 12:15:50 +02:00