From c1a504a05f17c31fc5f7949a488c76ac2c3b1714 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Mar 2026 21:49:54 +0000
Subject: [PATCH] Add test for oxidised cookbook

---
 .github/workflows/test-kitchen.yml                |  1 +
 .kitchen.yml                                      |  3 +++
 cookbooks/oxidized/recipes/default.rb             |  1 +
 test/data_bags/oxidized/devices.json              | 11 +++++++++++
 test/data_bags/oxidized/keys.json                 | 13 +++++++++++++
 test/integration/oxidized/inspec/oxidized_spec.rb |  4 ++++
 6 files changed, 33 insertions(+)
 create mode 100644 test/data_bags/oxidized/devices.json
 create mode 100644 test/data_bags/oxidized/keys.json
 create mode 100644 test/integration/oxidized/inspec/oxidized_spec.rb

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 9127253d3..f5ac14b0e 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -80,6 +80,7 @@ jobs:
           - osqa
           - otrs
           - overpass
+          - oxidized
           - passenger
           - php
           - php-apache
diff --git a/.kitchen.yml b/.kitchen.yml
index 20955b588..d45cc0a95 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -322,6 +322,9 @@ suites:
   - name: overpass
     run_list:
       - recipe[overpass::default]
+  - name: oxidized
+    run_list:
+      - recipe[oxidized::default]
   - name: passenger
     run_list:
       - recipe[passenger::default]
diff --git a/cookbooks/oxidized/recipes/default.rb b/cookbooks/oxidized/recipes/default.rb
index efbbc89d2..e6baa92b9 100644
--- a/cookbooks/oxidized/recipes/default.rb
+++ b/cookbooks/oxidized/recipes/default.rb
@@ -141,6 +141,7 @@ git "/var/lib/oxidized/configs.git" do
   checkout_branch "master" # branch is hardcoded in oxidized
   user "oxidized"
   group "oxidized"
+  not_if { kitchen? }
 end
 
 bundle_config "/opt/oxidized/daemon" do
diff --git a/test/data_bags/oxidized/devices.json b/test/data_bags/oxidized/devices.json
new file mode 100644
index 000000000..83eb6f641
--- /dev/null
+++ b/test/data_bags/oxidized/devices.json
@@ -0,0 +1,11 @@
+{
+  "id": "devices",
+  "hardware": {
+    "test": {
+      "device": "localhost",
+      "input": "ftp",
+      "username": "oxidized",
+      "password": "password"
+    }
+  }
+}
diff --git a/test/data_bags/oxidized/keys.json b/test/data_bags/oxidized/keys.json
new file mode 100644
index 000000000..989576987
--- /dev/null
+++ b/test/data_bags/oxidized/keys.json
@@ -0,0 +1,13 @@
+{
+  "id": "keys",
+  "git": [
+    "-----BEGIN OPENSSH PRIVATE KEY-----",
+    "b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW",
+    "QyNTUxOQAAACDOeXf7B1Gx+k1Uy3SfysWkwq0aLS8leGwsWnQNx7vMAAAAAKAAKPkIACj5",
+    "CAAAAAtzc2gtZWQyNTUxOQAAACDOeXf7B1Gx+k1Uy3SfysWkwq0aLS8leGwsWnQNx7vMAA",
+    "AAAECVk3IZuOGCWNYARIEUF4lvDdobVHH5b0SoC4QtQ/0nZM55d/sHUbH6TVTLdJ/KxaTC",
+    "rRotLyV4bCxadA3Hu8wAAAAAF3RvbUBiZXJpY290ZS5jb21wdG9uLm51AQIDBAUG",
+    "-----END OPENSSH PRIVATE KEY-----",
+    ""
+  ]
+}
diff --git a/test/integration/oxidized/inspec/oxidized_spec.rb b/test/integration/oxidized/inspec/oxidized_spec.rb
new file mode 100644
index 000000000..df6aaab9e
--- /dev/null
+++ b/test/integration/oxidized/inspec/oxidized_spec.rb
@@ -0,0 +1,4 @@
+describe service("oxidized") do
+  it { should be_enabled }
+  it { should be_running }
+end
-- 
2.47.3