23 Commits

Author SHA1 Message Date
Jaime van Kessel
894dbcf6f6 Revert "Added skip mark to failing cloud tests"
This reverts commit 665c33156468270e53fb2702f7d60f0deab0618a.
2019-01-17 14:43:43 +01:00
Jaime van Kessel
c6628560bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:42:56 +01:00
Jaime van Kessel
665c331564 Added skip mark to failing cloud tests 2019-01-17 13:04:04 +01:00
Daniel Schiavini
badb0b0ca9 Use patch.object to allow relative imports
Issue STAR-322.
2019-01-17 12:58:23 +01:00
ChrisTerBeke
aab1fbc73f Try other patch values for relative imports 2019-01-17 10:22:37 +01:00
ChrisTerBeke
de24c7d9c3 Revert "Remove mock changes used locally"
This reverts commit 7785555a943b600636809ae5c5e50cabecdd79fd.
2019-01-15 09:35:28 +01:00
Daniel Schiavini
7785555a94 Remove mock changes used locally 2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
ChrisTerBeke
13d390a7d9 Fix imports in tests, some cleanup 2019-01-14 10:43:32 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
Daniel Schiavini
75d7d49349 STAR-322: Mocking the CuraApp 2018-12-17 14:41:28 +01:00
Daniel Schiavini
3b367938de STAR-322: Removing TestSendMaterialJob temporarily 2018-12-17 13:53:31 +01:00
Daniel Schiavini
b6f90f1ab2 STAR-322: Using cura constants 2018-12-17 13:29:20 +01:00
Daniel Schiavini
a1cb09f73f STAR-322: Sorting clusters 2018-12-17 13:24:07 +01:00
Daniel Schiavini
2f08854097 STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished 2018-12-14 14:50:15 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
Daniel Schiavini
d54fc4182b STAR-322: Fixing style errors 2018-12-11 11:56:36 +01:00
Daniel Schiavini
7668801564 STAR-322: Adding documentation and fixing model types 2018-12-11 11:12:32 +01:00
Marijn Deé
99cfef6cdc Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:25:26 +01:00
Daniel Schiavini
f432d7c858 STAR-322: Using a test setup to run tests with Cura app 2018-12-10 13:11:42 +01:00
Marijn Deé
07801b5394 First test for CloudDevices 2018-12-07 16:21:08 +01:00