Merge branch 'cherry-pick-a83ae7e0' into 'releases/3.7'

Merge branch 'fix/3dnonuniformdiamond_timeout' into 'master'

See merge request !3714

test/freeflow/navierstokes/channel/3d_nonuniform/CMakeLists.txt

@@ -7,6 +7,7 @@ dumux_add_test(NAME test_ff_stokes_channel_3d_nonuniform_diamond
                COMPILE_DEFINITIONS TYPETAG_MOMENTUM=ThreeDChannelTestMomentumDiamond
                COMPILE_DEFINITIONS TYPETAG_MASS=ThreeDChannelTestMassTpfa
                LABELS freeflow navierstokes
+               TIMEOUT 3600
                CMAKE_GUARD "( HAVE_UMFPACK AND dune-uggrid_FOUND )"
                COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                CMD_ARGS      --script fuzzy