feat(distro): add centos-7 support

[arvados-formula.git] / test / integration / controller / controls / config_spec.rb

diff --git a/test/integration/controller/controls/config_spec.rb b/test/integration/controller/controls/config_spec.rb
index 6e64bc40876842ad024ab91767f2afda1f8413e3..d885e9b9b37446cb2dc9fc3ecaf76bd9401146f5 100644 (file)
--- a/test/integration/controller/controls/config_spec.rb
+++ b/test/integration/controller/controls/config_spec.rb
@@ -3,19 +3,28 @@
 controller_stanza = <<-CONTROLLER_STANZA
       Keepstore:
         InternalURLs:
-          "http://keep0.example.net:25107/": {}
+          http://keep0.fixme.example.net:25107: {}
 CONTROLLER_STANZA
 
 volumes_stanza = <<-VOLUMES_STANZA
     Volumes:
-      ### VOLUME_ONE
       fixme-nyw5e-000000000000000:
+        AccessViaHosts:
+          http://keep0.fixme.example.net:25107:
+            ReadOnly: false
         Driver: Directory
-        DriverParameters: {Root: /tmp}
-        AccessViaHosts: {'http://keep0.example.net:25107/': {}}
+        DriverParameters:
+          Root: /tmp
         Replication: 2
 VOLUMES_STANZA
 
+group = case os[:name]
+        when 'centos'
+          'nginx'
+        when 'debian', 'ubuntu'
+          'www-data'
+        end
+
 control 'arvados configuration' do
   title 'should match desired controller lines'
 
@@ -23,7 +32,7 @@ control 'arvados configuration' do
     it { should be_file }
     it { should be_owned_by 'root' }
     # We're testing it in the API instance, so group will be nginx's
-    it { should be_grouped_into 'www-data' }
+    it { should be_grouped_into group }
     its('mode') { should cmp '0640' }
     its('content') do
       should include(