Reduce print output during happy path of automated tests

It should really just not print anything except what pytest prints, so you can easily see what tests have failed and what have not.

cura/Arranging/Arrange.py

@@ -217,11 +217,6 @@ class Arrange:
         prio_slice = self._priority[min_y:max_y, min_x:max_x]
         prio_slice[new_occupied] = 999
 
-        # If you want to see how the rasterized arranger build plate looks like, uncomment this code
-        # numpy.set_printoptions(linewidth=500, edgeitems=200)
-        # print(self._occupied.shape)
-        # print(self._occupied)
-
     @property
     def isEmpty(self):
         return self._is_empty

cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from UM.Application import Application
@@ -48,7 +48,6 @@ class ArrangeArray:
         return self._count
 
     def get(self, index):
-        print(self._arrange)
         return self._arrange[index]
 
     def getFirstEmpty(self):

tests/Settings/TestProfiles.py

@@ -82,7 +82,7 @@ def test_validateQualityProfiles(file_name):
 
     except Exception as e:
         # File can't be read, header sections missing, whatever the case, this shouldn't happen!
-        print("Go an Exception while reading he file [%s]: %s" % (file_name, e))
+        print("Got an Exception while reading he file [%s]: %s" % (file_name, e))
         assert False
 
 
@@ -110,5 +110,5 @@ def test_validateVariantProfiles(file_name):
                     assert False
     except Exception as e:
         # File can't be read, header sections missing, whatever the case, this shouldn't happen!
-        print("Go an Exception while reading he file [%s]: %s" % (file_name, e))
+        print("Got an Exception while reading he file [%s]: %s" % (file_name, e))
         assert False

tests/TestArrange.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import numpy
@@ -10,35 +10,29 @@ from cura.Arranging.ShapeArray import ShapeArray
 def gimmeTriangle():
     return numpy.array([[-3, 1], [3, 1], [0, -3]], dtype=numpy.int32)
 
-
 ##  Boring square
 def gimmeSquare():
     return numpy.array([[-2, -2], [2, -2], [2, 2], [-2, 2]], dtype=numpy.int32)
 
-
 ##  Triangle of area 12
 def gimmeShapeArray(scale = 1.0):
     vertices = gimmeTriangle()
     shape_arr = ShapeArray.fromPolygon(vertices, scale = scale)
     return shape_arr
 
-
 ##  Boring square
 def gimmeShapeArraySquare(scale = 1.0):
     vertices = gimmeSquare()
     shape_arr = ShapeArray.fromPolygon(vertices, scale = scale)
     return shape_arr
 
-
 ##  Smoke test for Arrange
 def test_smoke_arrange():
-    ar = Arrange.create(fixed_nodes = [])
-
+    Arrange.create(fixed_nodes = [])
 
 ##  Smoke test for ShapeArray
 def test_smoke_ShapeArray():
-    shape_arr = gimmeShapeArray()
-
+    gimmeShapeArray()
 
 ##  Test ShapeArray
 def test_ShapeArray():
@@ -47,12 +41,9 @@ def test_ShapeArray():
     ar.centerFirst()
 
     shape_arr = gimmeShapeArray(scale)
-    print(shape_arr.arr)
     count = len(numpy.where(shape_arr.arr == 1)[0])
-    print(count)
     assert count >= 10  # should approach 12
 
-
 ##  Test ShapeArray with scaling
 def test_ShapeArray_scaling():
     scale = 2
@@ -60,12 +51,9 @@ def test_ShapeArray_scaling():
     ar.centerFirst()
 
     shape_arr = gimmeShapeArray(scale)
-    print(shape_arr.arr)
     count = len(numpy.where(shape_arr.arr == 1)[0])
-    print(count)
     assert count >= 40  # should approach 2*2*12 = 48
 
-
 ##  Test ShapeArray with scaling
 def test_ShapeArray_scaling2():
     scale = 0.5
@@ -73,12 +61,9 @@ def test_ShapeArray_scaling2():
     ar.centerFirst()
 
     shape_arr = gimmeShapeArray(scale)
-    print(shape_arr.arr)
     count = len(numpy.where(shape_arr.arr == 1)[0])
-    print(count)
     assert count >= 1  # should approach 3, but it can be inaccurate due to pixel rounding
 
-
 ##  Test centerFirst
 def test_centerFirst():
     ar = Arrange(300, 300, 150, 150, scale = 1)
@@ -90,7 +75,6 @@ def test_centerFirst():
     assert ar._priority[150][150] < ar._priority[150][130]
     assert ar._priority[150][150] < ar._priority[130][130]
 
-
 ##  Test centerFirst
 def test_centerFirst_rectangular():
     ar = Arrange(400, 300, 200, 150, scale = 1)
@@ -102,12 +86,10 @@ def test_centerFirst_rectangular():
     assert ar._priority[150][200] < ar._priority[130][200]
     assert ar._priority[150][200] < ar._priority[130][180]
 
-
 ##  Test centerFirst
 def test_centerFirst_rectangular2():
     ar = Arrange(10, 20, 5, 10, scale = 1)
     ar.centerFirst()
-    print(ar._priority)
     assert ar._priority[10][5] < ar._priority[10][7]
 
 
@@ -120,7 +102,6 @@ def test_backFirst():
     assert ar._priority[150][150] > ar._priority[130][150]
     assert ar._priority[150][150] > ar._priority[130][130]
 
-
 ##  See if the result of bestSpot has the correct form
 def test_smoke_bestSpot():
     ar = Arrange(30, 30, 15, 15, scale = 1)
@@ -133,7 +114,6 @@ def test_smoke_bestSpot():
     assert hasattr(best_spot, "penalty_points")
     assert hasattr(best_spot, "priority")
 
-
 ##  Real life test
 def test_bestSpot():
     ar = Arrange(16, 16, 8, 8, scale = 1)
@@ -151,9 +131,6 @@ def test_bestSpot():
     assert best_spot.x != 0 or best_spot.y != 0  # it can't be on the same location
     ar.place(best_spot.x, best_spot.y, shape_arr)
 
-    print(ar._occupied)  # For debugging
-
-
 ##  Real life test rectangular build plate
 def test_bestSpot_rectangular_build_plate():
     ar = Arrange(16, 40, 8, 20, scale = 1)
@@ -187,9 +164,6 @@ def test_bestSpot_rectangular_build_plate():
     best_spot_x = ar.bestSpot(shape_arr)
     ar.place(best_spot_x.x, best_spot_x.y, shape_arr)
 
-    print(ar._occupied)  # For debugging
-
-
 ##  Real life test
 def test_bestSpot_scale():
     scale = 0.5
@@ -202,17 +176,12 @@ def test_bestSpot_scale():
     assert best_spot.y == 0
     ar.place(best_spot.x, best_spot.y, shape_arr)
 
-    print(ar._occupied)
-
     # Place object a second time
     best_spot = ar.bestSpot(shape_arr)
     assert best_spot.x is not None  # we found a location
     assert best_spot.x != 0 or best_spot.y != 0  # it can't be on the same location
     ar.place(best_spot.x, best_spot.y, shape_arr)
 
-    print(ar._occupied)  # For debugging
-
-
 ##  Real life test
 def test_bestSpot_scale_rectangular():
     scale = 0.5
@@ -227,8 +196,6 @@ def test_bestSpot_scale_rectangular():
     assert best_spot.y == 0
     ar.place(best_spot.x, best_spot.y, shape_arr_square)
 
-    print(ar._occupied)
-
     # Place object a second time
     best_spot = ar.bestSpot(shape_arr)
     assert best_spot.x is not None  # we found a location
@@ -238,9 +205,6 @@ def test_bestSpot_scale_rectangular():
     best_spot = ar.bestSpot(shape_arr_square)
     ar.place(best_spot.x, best_spot.y, shape_arr_square)
 
-    print(ar._occupied)  # For debugging
-
-
 ##  Try to place an object and see if something explodes
 def test_smoke_place():
     ar = Arrange(30, 30, 15, 15)
@@ -252,7 +216,6 @@ def test_smoke_place():
     ar.place(0, 0, shape_arr)
     assert numpy.any(ar._occupied)
 
-
 ##  See of our center has less penalty points than out of the center
 def test_checkShape():
     ar = Arrange(30, 30, 15, 15)
@@ -265,12 +228,10 @@ def test_checkShape():
     assert points2 > points
     assert points3 > points
 
-
 ##  See of our center has less penalty points than out of the center
 def test_checkShape_rectangular():
     ar = Arrange(20, 30, 10, 15)
     ar.centerFirst()
-    print(ar._priority)
 
     shape_arr = gimmeShapeArray()
     points = ar.checkShape(0, 0, shape_arr)
@@ -279,20 +240,18 @@ def test_checkShape_rectangular():
     assert points2 > points
     assert points3 > points
 
-
 ## Check that placing an object on occupied place returns None.
 def test_checkShape_place():
     ar = Arrange(30, 30, 15, 15)
     ar.centerFirst()
 
     shape_arr = gimmeShapeArray()
-    points = ar.checkShape(3, 6, shape_arr)
+    ar.checkShape(3, 6, shape_arr)
     ar.place(3, 6, shape_arr)
     points2 = ar.checkShape(3, 6, shape_arr)
 
     assert points2 is None
 
-
 ##  Test the whole sequence
 def test_smoke_place_objects():
     ar = Arrange(20, 20, 10, 10, scale = 1)
@@ -303,35 +262,30 @@ def test_smoke_place_objects():
         best_spot_x, best_spot_y, score, prio = ar.bestSpot(shape_arr)
         ar.place(best_spot_x, best_spot_y, shape_arr)
 
-
 # Test some internals
 def test_compare_occupied_and_priority_tables():
     ar = Arrange(10, 15, 5, 7)
     ar.centerFirst()
     assert ar._priority.shape == ar._occupied.shape
 
-
 ##  Polygon -> array
 def test_arrayFromPolygon():
     vertices = numpy.array([[-3, 1], [3, 1], [0, -3]])
     array = ShapeArray.arrayFromPolygon([5, 5], vertices)
     assert numpy.any(array)
 
-
 ##  Polygon -> array
 def test_arrayFromPolygon2():
     vertices = numpy.array([[-3, 1], [3, 1], [2, -3]])
     array = ShapeArray.arrayFromPolygon([5, 5], vertices)
     assert numpy.any(array)
 
-
 ##  Polygon -> array
 def test_fromPolygon():
     vertices = numpy.array([[0, 0.5], [0, 0], [0.5, 0]])
     array = ShapeArray.fromPolygon(vertices, scale=0.5)
     assert numpy.any(array.arr)
 
-
 ##  Line definition -> array with true/false
 def test_check():
     base_array = numpy.zeros([5, 5], dtype=float)
@@ -342,7 +296,6 @@ def test_check():
     assert check_array[3][0]
     assert not check_array[0][3]
 
-
 ##  Line definition -> array with true/false
 def test_check2():
     base_array = numpy.zeros([5, 5], dtype=float)
@@ -353,22 +306,17 @@ def test_check2():
     assert not check_array[3][0]
     assert check_array[3][4]
 
-
 ##  Just adding some stuff to ensure fromNode works as expected. Some parts should actually be in UM
 def test_parts_of_fromNode():
     from UM.Math.Polygon import Polygon
     p = Polygon(numpy.array([[-2, -2], [2, -2], [2, 2], [-2, 2]], dtype=numpy.int32))
     offset = 1
-    print(p._points)
     p_offset = p.getMinkowskiHull(Polygon.approximatedCircle(offset))
-    print("--------------")
-    print(p_offset._points)
     assert len(numpy.where(p_offset._points[:, 0] >= 2.9)) > 0
     assert len(numpy.where(p_offset._points[:, 0] <= -2.9)) > 0
     assert len(numpy.where(p_offset._points[:, 1] >= 2.9)) > 0
     assert len(numpy.where(p_offset._points[:, 1] <= -2.9)) > 0
 
-
 def test_parts_of_fromNode2():
     from UM.Math.Polygon import Polygon
     p = Polygon(numpy.array([[-2, -2], [2, -2], [2, 2], [-2, 2]], dtype=numpy.int32) * 2)  # 4x4
@@ -378,4 +326,4 @@ def test_parts_of_fromNode2():
     shape_arr1 = ShapeArray.fromPolygon(p._points, scale = scale)
     shape_arr2 = ShapeArray.fromPolygon(p_offset._points, scale = scale)
     assert shape_arr1.arr.shape[0] >= (4 * scale) - 1  # -1 is to account for rounding errors
-    assert shape_arr2.arr.shape[0] >= (2 * offset + 4) * scale - 1
+    assert shape_arr2.arr.shape[0] >= (2 * offset + 4) * scale - 1

tests/TestPrintInformation.py

@@ -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