Support LS 7 in tests

.travis.yml

@@ -66,4 +66,3 @@ env:
     - PUPPET_VERSION=5.5.16 BEAKER_set=ubuntu-1604 LOGSTASH_VERSION=6.8.2
     - PUPPET_VERSION=6.0.10 BEAKER_set=ubuntu-1604
     - PUPPET_VERSION=6.0.10 BEAKER_set=ubuntu-1604 LOGSTASH_VERSION=6.8.2
-

manifests/plugin.pp

@@ -48,7 +48,7 @@
 
   Exec {
     path        => '/bin:/usr/bin',
-    cwd         => '/tmp',
+    cwd         => $logstash::home_dir,
     user        => $logstash::logstash_user,
     timeout     => 1800,
     environment => $environment,
@@ -116,7 +116,7 @@
     'absent': {
       exec { "remove-${name}":
         command => "${exe} remove ${name}",
-        onlyif  => "${exe} list | grep -q ^${name}$",
+        onlyif  => "${exe} list --installed | grep -q ^${name}$",
       }
     }
 

spec/acceptance/class_plugin_spec.rb

@@ -26,18 +26,19 @@ def remove(plugin)
   end
 
   context 'when a plugin is not installed' do
+    plugin = "logstash-output-riemann"
     before(:each) do
-      remove('logstash-input-sqs')
+      remove(plugin)
     end
 
     it 'will not remove it again' do
-      log = ensure_plugin('absent', 'logstash-input-sqs').stdout
-      expect(log).to_not contain('remove-logstash-input-sqs')
+      log = ensure_plugin('absent', plugin).stdout
+      expect(log).to_not contain("remove-#{plugin}")
     end
 
     it 'can install it from rubygems' do
-      ensure_plugin('present', 'logstash-input-sqs')
-      expect(installed_plugins).to contain('logstash-input-sqs')
+      ensure_plugin('present', plugin)
+      expect(installed_plugins).to contain(plugin)
     end
   end