From cb89bdacb3fb530a1b29940d9f47cf6d842eed15 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 3 Jul 2022 02:21:16 +0900
Subject: [PATCH] Debian/Ubuntu: Enable validations in acceptance tests

Now a few deployment validations are implemented in acceptance tests
but these are enabled in only CentOS/RHEL. This enables these in Debian
and Ubuntu because there is no distro-specific requirement.

Change-Id: I7b50f49fe4316c83f169bfdbdd5d79a5e3b9b253
---
 spec/acceptance/10_basic_barbican_spec.rb | 26 +++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/spec/acceptance/10_basic_barbican_spec.rb b/spec/acceptance/10_basic_barbican_spec.rb
index 42ff365e..4681c64d 100644
--- a/spec/acceptance/10_basic_barbican_spec.rb
+++ b/spec/acceptance/10_basic_barbican_spec.rb
@@ -35,26 +35,24 @@ describe 'barbican::api basic test class' do
       apply_manifest(pp, :catch_changes  => true)
     end
 
-    if os[:family].casecmp('RedHat') == 0
-      describe 'store a secret' do
-        it 'should store a secret' do
-          command('barbican --os-username barbican --os-password a_big_secret --os-project-name services --os-user-domain-name Default --os-project-domain-name Default --os-auth-url http://127.0.0.1:5000/v3 --endpoint http://localhost:9311 secret store --payload "my big bad secret" --os-identity-api-version 3') do |r|
-            expect(r.stdout).to match(/ACTIVE/)
-          end
+    describe 'store a secret' do
+      it 'should store a secret' do
+        command('barbican --os-username barbican --os-password a_big_secret --os-project-name services --os-user-domain-name Default --os-project-domain-name Default --os-auth-url http://127.0.0.1:5000/v3 --endpoint http://localhost:9311 secret store --payload "my big bad secret" --os-identity-api-version 3') do |r|
+          expect(r.stdout).to match(/ACTIVE/)
         end
       end
+    end
 
-      describe 'generate a secret' do
-        it 'should generate a secret' do
-          command('barbican --os-username barbican --os-password a_big_secret --os-project-name services --os-user-domain-name Default --os-project-domain-name Default --os-auth-url http://127.0.0.1:5000/v3 --endpoint http://localhost:9311 secret order create key --name foo --os-identity-api-version 3') do |r|
-            expect(r.stdout).to match(/Order href/)
-          end
+    describe 'generate a secret' do
+      it 'should generate a secret' do
+        command('barbican --os-username barbican --os-password a_big_secret --os-project-name services --os-user-domain-name Default --os-project-domain-name Default --os-auth-url http://127.0.0.1:5000/v3 --endpoint http://localhost:9311 secret order create key --name foo --os-identity-api-version 3') do |r|
+          expect(r.stdout).to match(/Order href/)
         end
       end
+    end
 
-      describe port(9311) do
-        it { is_expected.to be_listening }
-      end
+    describe port(9311) do
+      it { is_expected.to be_listening }
     end
   end
 end