Merge branch 'master' into ck-fixjinja-location

Author: DvirDukhan

tests/flow/tests_dag_errors.py

@@ -282,7 +282,6 @@ def test_dag_error_before_tensorget_op(env):
     env.assertEqual(type(ret[2]), redis.exceptions.ResponseError)
     expected_error_msg = 'Incompatible shapes: [2] vs. [2,2,3] \t [[{{node mul}}]]'
     if DEVICE != 'CPU':
-        expected_error_msg = '2 root error(s) found.   (0) Invalid argument: required broadcastable shapes' \
-                             ' 	 [[{{node mul}}]]   (1) Invalid argument: required broadcastable shapes' \
-                             ' 	 [[{{node mul}}]] 	 [[mul/_5]] 0 successful operations. 0 derived errors ignored.'
-    env.assertEqual(expected_error_msg, str(ret[2]))
+        expected_error_msg = 'Invalid argument: required broadcastable shapes' \
+                             ' 	 [[{{node mul}}]]'
+    env.assertContains(expected_error_msg, str(ret[2]))