Merge pull request #361 from bskarda/fix_tests

Fix chefspec tests
michaelklishin · Sep 28, 2017 · a2dbd63 · a2dbd63
2 parents 27e6e2d + 904cefa
commit a2dbd63
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/spec/opscenter_agent_datastax_spec.rb b/spec/opscenter_agent_datastax_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it 'installs the agent package' do
-    expect(chef_run).to install_package('datastax-agent').with(options: ['--always-have-options'])
+    expect(chef_run).to install_package('datastax-agent').with(options: '--always-have-options')
   end
 
   it 'starts & enables the service' do

diff --git a/spec/rendered_templates/cassandra-env.sh b/spec/rendered_templates/cassandra-env.sh
@@ -300,6 +300,7 @@ JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
 
 
 
+
 JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS"
 JVM_OPTS="$JVM_OPTS $MX4J_PORT"
 JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS"
diff --git a/templates/default/logback.xml.erb b/templates/default/logback.xml.erb
@@ -67,7 +67,6 @@
       <pattern><%= node['cassandra']['logback']['debug']['pattern'] %></pattern>
     </encoder>
   </appender>
-  <% end -%>
 
   <!-- ASYNCLOG assynchronous appender to debug.log (all levels) -->
 

diff --git a/test/integration/opscenter-agent-datastax/serverspec/opscenter_datastax_agent_spec.rb b/test/integration/opscenter-agent-datastax/serverspec/opscenter_datastax_agent_spec.rb
@@ -1,16 +1,13 @@
 require 'spec_helper'
 
 describe 'opscenter-datastax-agent' do
-  it 'installs, enables & runs the agent' do
+  context 'installs, enables & runs the agent' do
     describe package('datastax-agent') do
       it { should be_installed }
     end
 
     describe service('datastax-agent') do
       it { should be_enabled }
-    end
-
-    describe service('datastax-agent') do
       it { should be_running }
     end
   end