Merge pull request #72 from killbill/fix-plugin-tests

plugins: pass plugin version when uninstalling plugin
killbill · Mar 25, 2024 · bb75f21 · bb75f21
2 parents a57eece + 4a909c1
commit bb75f21
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/killbill-integration-tests/plugins/adyen/test_adyen.rb b/killbill-integration-tests/plugins/adyen/test_adyen.rb
@@ -24,7 +24,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/analytics/test_analytics.rb b/killbill-integration-tests/plugins/analytics/test_analytics.rb
@@ -29,7 +29,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/avatax/test_avatax.rb b/killbill-integration-tests/plugins/avatax/test_avatax.rb
@@ -70,7 +70,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_manual_commit

diff --git a/killbill-integration-tests/plugins/braintree/test_braintree.rb b/killbill-integration-tests/plugins/braintree/test_braintree.rb
@@ -30,7 +30,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/catalog-test/test_catalog_plugin_test.rb b/killbill-integration-tests/plugins/catalog-test/test_catalog_plugin_test.rb
@@ -24,7 +24,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/deposit/test_deposit.rb b/killbill-integration-tests/plugins/deposit/test_deposit.rb
@@ -29,7 +29,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/email-notifications/test_email_notifications.rb b/killbill-integration-tests/plugins/email-notifications/test_email_notifications.rb
@@ -105,7 +105,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
       @smtp_server&.shutdown_and_wait_for_completion
     end
 

diff --git a/killbill-integration-tests/plugins/gocardless/test_gocardless.rb b/killbill-integration-tests/plugins/gocardless/test_gocardless.rb
@@ -28,7 +28,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/invgrp/test_invgrp_demo.rb b/killbill-integration-tests/plugins/invgrp/test_invgrp_demo.rb
@@ -25,7 +25,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/payment-test/payment_test_base.rb b/killbill-integration-tests/plugins/payment-test/payment_test_base.rb
@@ -27,7 +27,7 @@ def teardown
       body = { 'CONFIGURE_ACTION': 'ACTION_CLEAR' }.to_json
       KillBillClient::API.post(KILLBILL_PAYMENT_TEST_PREFIX + '/configure', body, {}, @options)
 
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
   end
 end
diff --git a/killbill-integration-tests/plugins/plugin_base.rb b/killbill-integration-tests/plugins/plugin_base.rb
@@ -14,9 +14,9 @@ def setup_plugin_base(init_clock, plugin_key, plugin_version, plugin_props)
       end
     end
 
-    def teardown_plugin_base(plugin_key)
+    def teardown_plugin_base(plugin_key, plugin_version)
       prepare_teardown_sequence(plugin_key) do |seq|
-        run_plugin_sequence('stop', plugin_key, nil, [], seq)
+        run_plugin_sequence('stop', plugin_key, plugin_version, [], seq)
       end
       teardown_base
     end

diff --git a/killbill-integration-tests/plugins/qualpay/test_qualpay.rb b/killbill-integration-tests/plugins/qualpay/test_qualpay.rb
@@ -28,7 +28,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck

diff --git a/killbill-integration-tests/plugins/stripe/stripe_base.rb b/killbill-integration-tests/plugins/stripe/stripe_base.rb
@@ -28,7 +28,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
   end
 end
diff --git a/killbill-integration-tests/plugins/vertex/test_vertex.rb b/killbill-integration-tests/plugins/vertex/test_vertex.rb
@@ -31,7 +31,7 @@ def setup
     end
 
     def teardown
-      teardown_plugin_base(PLUGIN_KEY)
+      teardown_plugin_base(PLUGIN_KEY, PLUGIN_VERSION)
     end
 
     def test_healthcheck