Merge pull request #660 from powerhome/global-timeout

Prints the correct argument name in error message
Shopify · Dec 23, 2019 · 13f0434 · 13f0434
2 parents db1734e + 077d10d
commit 13f0434
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## next
 
+*Bug Fixes*
+- Prints the correct argument name in error message. [#670](https://github.com/Shopify/krane/pull/670)
+
 ## 1.1.0
 
 *Bug Fixes*

diff --git a/lib/krane/kubernetes_resource.rb b/lib/krane/kubernetes_resource.rb
@@ -256,7 +256,7 @@ def debug_message(cause = nil, info_hash = {})
       if cause == :gave_up
         debug_heading = ColorizedString.new("#{id}: GLOBAL WATCH TIMEOUT (#{info_hash[:timeout]} seconds)").yellow
         helpful_info << "If you expected it to take longer than #{info_hash[:timeout]} seconds for your deploy"\
-        " to roll out, increase --max-watch-seconds."
+        " to roll out, increase --global-timeout."
       elsif deploy_failed?
         debug_heading = ColorizedString.new("#{id}: FAILED").red
         helpful_info << failure_message if failure_message.present?

diff --git a/test/integration/global_deploy_test.rb b/test/integration/global_deploy_test.rb
@@ -44,7 +44,7 @@ def test_global_deploy_task_success_timeout
       "Result: TIMED OUT",
       "Timed out waiting for 2 resources to deploy",
       %r{StorageClass\/testing-storage-class[\w-]+: GLOBAL WATCH TIMEOUT \(0 seconds\)},
-      "If you expected it to take longer than 0 seconds for your deploy to roll out, increase --max-watch-seconds.",
+      "If you expected it to take longer than 0 seconds for your deploy to roll out, increase --global-timeout.",
     ])
   end
 

diff --git a/test/integration/krane_deploy_test.rb b/test/integration/krane_deploy_test.rb
@@ -1335,7 +1335,7 @@ def test_resource_watcher_raises_after_timeout_seconds
       "Successful resources",
       "Service/multi-replica",
       "Deployment/undying: GLOBAL WATCH TIMEOUT (5 seconds)",
-      "If you expected it to take longer than 5 seconds for your deploy to roll out, increase --max-watch-seconds.",
+      "If you expected it to take longer than 5 seconds for your deploy to roll out, increase --global-timeout.",
     ], in_order: true)
   end