Address Andrew's prior comments (GoogleCloudPlatform#1623)

Ace Nassri · web-flow · commit 9b3ff8230aae · 2018-08-10T14:24:15.000-07:00
Change-Id: I8585d37ea6e17f33c554ede550fe171be11ed0e2
diff --git a/functions/concepts/main.py b/functions/concepts/main.py
@@ -40,10 +40,12 @@ def statelessness(request):
 # [END functions_concepts_stateless]
 
 
+# Placeholder
 def heavy_computation():
     return time.time()
 
 
+# Placeholder
 def light_computation():
     return time.time()
 
@@ -101,7 +103,8 @@ def timeout(request):
     time.sleep(120)
 
     # May not execute if function's timeout is <2 minutes
-    return 'Done!'
+    print('Function completed!')
+    return 'Function completed!'
 # [END functions_concepts_after_timeout]
 
 
diff --git a/functions/tips/main.py b/functions/tips/main.py
@@ -25,12 +25,14 @@
 # [END functions_tips_connection_pooling]
 
 
+# Placeholder
 def file_wide_computation():
-    return sum(range(10))
+    return 1
 
 
+# Placeholder
 def function_specific_computation():
-    return sum(range(10))
+    return 1
 
 
 # [START functions_tips_lazy_globals]
@@ -105,7 +107,8 @@ def avoid_infinite_retries(data, context):
     event_age = (datetime.now() - event_time).total_seconds() * 1000
 
     # Ignore events that are too old
-    if event_age > 10000:
+    max_age_ms = 10000
+    if event_age > max_age_ms:
         print('Dropped {} (age {}ms)'.format(context.event_id, event_age))
         return 'Timeout'
 
@@ -135,11 +138,11 @@ def retry_or_not(data, context):
         try_again = False
 
     try:
-        raise Exception('I failed you')
-    except Exception as e:
+        raise RuntimeError('I failed you')
+    except RuntimeError:
         error_client.report_exception()
         if try_again:
-            raise e  # Raise the exception and try again
+            raise  # Raise the exception and try again
         else:
-            return  # Swallow the exception and don't retry
+            pass   # Swallow the exception and don't retry
 # [END functions_tips_retry]
diff --git a/functions/tips/main_test.py b/functions/tips/main_test.py
@@ -84,7 +84,7 @@ def test_retry_or_not():
         assert error_client.report_exception.call_count == 1
 
         event.data = {'retry': True}
-        with pytest.raises(Exception):
+        with pytest.raises(RuntimeError):
             main.retry_or_not(event, None)
 
         assert error_client.report_exception.call_count == 2
