3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts with master

Browse source
This commit is contained in:
Lipu Fei 2019-03-21 14:59:53 +01:00
commit 4e5d08f320
153 changed files with 5127 additions and 3586 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/TestPrintInformation.py
View file

@ -77,8 +77,6 @@ def test_duration():
# Fake a print duration message
print_information._onPrintDurationMessage(0, {"travel": 20}, [10])
# Some debugging code, since this test sometimes fails on the CI server.
print("Testing debug;", print_information.getFeaturePrintTimes(), print_information.currentPrintTime)
# We only set a single time, so the total time must be of the same value.
assert int(print_information.currentPrintTime) == 20