system-test install-newly: remove unnecessary condition

Signed-off-by: Shizuo Fujita <[email protected]>
fluent · Nov 26, 2024 · 9c15e3d · 9c15e3d
1 parent 782d37e
commit 9c15e3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/fluent-package/apt/systemd-test/install-newly.sh b/fluent-package/apt/systemd-test/install-newly.sh
@@ -29,12 +29,9 @@ sudo fluent-gem install fluent-plugin-concat
 test $(find /tmp/ -name gem_local_list.output | xargs cat) = "fluent-plugin-concat"
 
 # Test: Guard duplicated instance
-if [ "$1" = "local" ]; then
-    # FIXME: until guard feature was released, skip v5 and lts.
-    (! sudo /usr/sbin/fluentd)
-    (! sudo /usr/sbin/fluentd -v)
-    sudo /usr/sbin/fluentd --dry-run
-fi
+(! sudo /usr/sbin/fluentd)
+(! sudo /usr/sbin/fluentd -v)
+sudo /usr/sbin/fluentd --dry-run
 
 sudo apt remove -y fluent-package
 

diff --git a/fluent-package/yum/systemd-test/install-newly.sh b/fluent-package/yum/systemd-test/install-newly.sh
@@ -51,12 +51,13 @@ if [ $1 = "local" ]; then
     sudo $DNF install -y tar findutils
     sudo /opt/fluent/bin/fluent-diagtool -t fluentd -o /tmp
     test $(find /tmp/ -name gem_local_list.output | xargs cat) = "fluent-plugin-concat"
-    # FIXME: until guard feature was released, skip v5 and lts.
-    (! sudo /usr/sbin/fluentd)
-    (! sudo /usr/sbin/fluentd -v)
-    sudo /usr/sbin/fluentd --dry-run
 fi
 
+# Test: Guard duplicated instance
+(! sudo /usr/sbin/fluentd)
+(! sudo /usr/sbin/fluentd -v)
+sudo /usr/sbin/fluentd --dry-run
+
 sudo $DNF remove -y fluent-package
 sudo systemctl daemon-reload