Fix up tests from rebasing

Shopify · Nov 7, 2019 · fa17169 · fa17169
1 parent d7de6cc
commit fa17169
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/lib/krane/resource_deployer.rb b/lib/krane/resource_deployer.rb
@@ -89,7 +89,7 @@ def deploy_resources(resources, prune: false, verify:, record_summary: true)
       # Apply can be done in one large batch, the rest have to be done individually
       applyables, individuals = resources.partition { |r| r.deploy_method == :apply }
       # Prunable resources should also applied so that they can  be pruned
-      pruneable_types = prune_whitelist.map { |t| t.split("/").last }
+      pruneable_types = @prune_whitelist.map { |t| t.split("/").last }
       applyables += individuals.select { |r| pruneable_types.include?(r.type) }
 
       individuals.each do |individual_resource|

diff --git a/test/integration-serial/serial_deploy_test.rb b/test/integration-serial/serial_deploy_test.rb
@@ -322,7 +322,7 @@ def test_all_expected_statsd_metrics_emitted_with_essential_tags
   end
 
   def test_global_deploy_emits_expected_statsd_metrics
-    metrics = capture_statsd_calls do
+    metrics = capture_statsd_calls(client: Krane::StatsD.client) do
       assert_deploy_success(deploy_global_fixtures('globals'))
     end
 

diff --git a/test/unit/krane/ejson_secret_provisioner_test.rb b/test/unit/krane/ejson_secret_provisioner_test.rb
@@ -109,7 +109,6 @@ def stub_server_dry_run_validation_request
         output_is_sensitive: true,
         retry_whitelist: [:client_timeout],
         attempts: 3,
-        use_namespace: true,
       })
   end