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 |