rouster 0.7 → 0.41

data/test/functional/deltas/test_get_ports.rb

@@ -8,7 +8,7 @@ class TestDeltasGetPorts < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
+      @app = Rouster.new(:name => 'app')
     end
 
     @app.up()
@@ -95,7 +95,6 @@ class TestDeltasGetPorts < Test::Unit::TestCase
     }
 
     @app.deltas[:ports] = stock
-    @app.cache[:ports]  = Time.now.to_i # since we're faking the contents, we also need to fake other artifacts that would have been generated
 
     assert_equal(true, @app.is_port_open?(1234, 'tcp', true))
     assert_equal(true, @app.is_port_active?(22, 'tcp', true))
@@ -108,35 +107,11 @@ class TestDeltasGetPorts < Test::Unit::TestCase
     assert_equal(false, @app.is_port_active?(1234, 'tcp', true))
 
     # caching/argument default validation -- can't currently do this, don't know what ports will be open on others systems
-    # TODO but can fix this by running some ncatish commands
     #assert_equal(true, @app.is_port_active?(22))
     #assert_equal(true, @app.is_port_open?(1234))
 
   end
 
-  def test_happy_path_cache_invalidation
-    res1, res2 = nil, nil
-
-    assert_nothing_raised do
-      res1 = @app.get_ports(true)
-    end
-
-    first_cache_time = @app.cache[:ports]
-
-    sleep (@app.cache_timeout + 1)
-
-    assert_nothing_raised do
-      res2 = @app.get_ports(true)
-    end
-
-    second_cache_time = @app.cache[:ports]
-
-    assert_equal(res1, res2)
-    assert_not_equal(first_cache_time, second_cache_time)
-    assert(second_cache_time > first_cache_time)
-
-  end
-
   def teardown
     @app = nil
   end

data/test/functional/deltas/test_get_services.rb

@@ -8,12 +8,13 @@ class TestDeltasGetServices < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
+      @app = Rouster.new(:name => 'app')
     end
 
     @app.up()
 
-    @allowed_states = %w(exists installed operational running stopped unsure)
+    # eventually this should be standardized (and symbolized?)
+    @allowed_states = %w(exists operational running stopped)
   end
 
   def test_happy_path
@@ -28,51 +29,11 @@ class TestDeltasGetServices < Test::Unit::TestCase
 
     res.each_key do |k|
       assert_not_nil(res[k])
-      assert(@allowed_states.member?(res[k]))
     end
 
-    # this isn't the best validation, but does prove a point - no nil keys/values
-    assert_nothing_raised do
-      res.keys.sort
-      res.values.sort
-    end
-
-  end
-
-  def test_happy_path_caching
-
-    assert_nil(@app.deltas[:services])
-
-    assert_nothing_raised do
-      @app.get_services(true)
-    end
-
-    assert_equal(Hash, @app.deltas[:services].class)
-
   end
 
-  def test_happy_path_cache_invalidation
-    res1, res2 = nil, nil
-
-    assert_nothing_raised do
-      res1 = @app.get_services(true)
-    end
-
-    first_cache_time = @app.cache[:services]
-
-    sleep (@app.cache_timeout + 1)
-
-    assert_nothing_raised do
-      res2 = @app.get_services(true)
-    end
-
-    second_cache_time = @app.cache[:services]
-
-    assert_equal(res1, res2)
-    assert_not_equal(first_cache_time, second_cache_time)
-    assert(second_cache_time > first_cache_time)
-
-  end
+  # TODO add some caching tests
 
   def teardown
     @app = nil

data/test/functional/deltas/test_get_users.rb

@@ -8,7 +8,7 @@ class TestDeltasGetUsers < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
+      @app = Rouster.new(:name => 'app')
     end
 
     @app.up()
@@ -36,40 +36,7 @@ class TestDeltasGetUsers < Test::Unit::TestCase
 
   end
 
-  def test_happy_path_caching
-
-    assert_nil(@app.deltas[:users])
-
-    assert_nothing_raised do
-      @app.get_users(true)
-    end
-
-    assert_equal(Hash, @app.deltas[:users].class)
-
-  end
-
-  def test_happy_path_cache_invalidation
-    res1, res2 = nil, nil
-
-    assert_nothing_raised do
-      res1 = @app.get_users(true)
-    end
-
-    first_cache_time = @app.cache[:users]
-
-    sleep (@app.cache_timeout + 1)
-
-    assert_nothing_raised do
-      res2 = @app.get_users(true)
-    end
-
-    second_cache_time = @app.cache[:users]
-
-    assert_equal(res1, res2)
-    assert_not_equal(first_cache_time, second_cache_time)
-    assert(second_cache_time > first_cache_time)
-
-  end
+  # TODO add some caching tests
 
   def teardown
     @app = nil

data/test/functional/puppet/test_facter.rb

@@ -8,7 +8,7 @@ class TestFacter < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
+      @app = Rouster.new(:name => 'app')
     end
 
     @app.up()
@@ -38,46 +38,6 @@ class TestFacter < Test::Unit::TestCase
     assert_equal(nil, @app.facts)
   end
 
-  def test_caching
-    # NOTE: this only works if (time_to_run_facter < cache_timeout)
-
-    assert_nothing_raised do
-      @app.facter(true)
-    end
-
-    first_cached_time = @app.cache[:facter]
-
-    assert_nothing_raised do
-      @app.facter(true)
-    end
-
-    second_cached_time = @app.cache[:facter]
-
-    assert_equal(first_cached_time, second_cached_time)
-
-  end
-
-  def test_cache_invalidation
-
-    assert_nothing_raised do
-      @app.facter(true)
-    end
-
-    first_cached_time = @app.cache[:facter]
-
-    sleep (@app.cache_timeout + 1)
-
-    assert_nothing_raised do
-      @app.facter(true)
-    end
-
-    second_cached_time = @app.cache[:facter]
-
-    assert_not_equal(first_cached_time, second_cached_time)
-    assert(second_cached_time > first_cached_time)
-
-  end
-
   def test_custom_facts
 
     facts = nil

data/test/functional/puppet/test_get_puppet_star.rb

@@ -0,0 +1,68 @@
+require sprintf('%s/../../../path_helper', File.dirname(File.expand_path(__FILE__)))
+
+require 'rouster'
+require 'rouster/puppet'
+require 'test/unit'
+
+# this is technically a unit test, no need for a real Rouster VM
+
+class TestGetPuppetStar < Test::Unit::TestCase
+
+  def setup
+    assert_nothing_raised do
+      @app = Rouster.new(:name => 'app')
+    end
+
+    # expose private methods
+    Rouster.send(:public, *Rouster.protected_instance_methods)
+  end
+
+  def test_happy_get_errors
+
+    output = "[1;35merr: Could not retrieve catalog from remote server: Error 400 on SERVER: no result for [api_vip] in Hiera (YAML/CMS)\nfizzybang\n[1;35merr: Could not retrieve catalog from remote server: Error 400 on SERVER: no result for [foobar] in Hiera (YAML/CMS)"
+    @app.output.push(output)
+
+    assert_not_nil(@app.get_puppet_errors())
+    assert_equal(2, @app.get_puppet_errors().size)
+    assert_equal(@app.get_puppet_errors(), @app.get_puppet_errors(output)) # could be split out to a different test
+
+    assert_nil(@app.get_puppet_notices())
+
+  end
+
+  def test_happy_get_notices
+
+    output = "[0;36mnotice: Not using cache on failed catalog\nfizzbang\n[0;36mnotice: Not using cache on failed catalog"
+    @app.output.push(output)
+
+    assert_not_nil(@app.get_puppet_notices())
+    assert_equal(2, @app.get_puppet_notices().size)
+    assert_equal(@app.get_puppet_notices(), @app.get_puppet_notices(output))
+
+    assert_nil(@app.get_puppet_errors())
+
+  end
+
+  def test_no_errors
+
+    output = 'there are no errors here'
+    @app.output.push(output)
+
+    assert_nil(@app.get_puppet_errors())
+  end
+
+  def test_no_notices
+
+    output = 'there are no notices here'
+    @app.output.push(output)
+
+    assert_nil(@app.get_puppet_notices())
+
+  end
+
+  def teardown
+    # noop
+  end
+
+end
+

data/test/functional/test_caching.rb

@@ -74,12 +74,8 @@ class TestCaching < Test::Unit::TestCase
   end
 
   def test_ssh_caching
-
     timeout = 100
-    app     = Rouster.new(:name => 'app', :sshtunnel => true, :cache_timeout => timeout)
-    app.destroy() # should be a no-op if running under rake, doing this to be safe
-
-    app.up()
+    app     = Rouster.new(:name => 'app', :cache_timeout => timeout)
 
     assert_equal(app.cache_timeout, timeout)
 

data/test/functional/test_dirs.rb

@@ -56,31 +56,6 @@ class TestDirs < Test::Unit::TestCase
 
   end
 
-  def test_case_sensitvity
-    dirs_to_create = ['Fizz', 'foo', 'baz']
-    dirs_expected_sensitive = ['foo']
-    dirs_expected_insensitive = ['Fizz', 'foo']
-
-    dirs_to_create.each do |dir|
-      @app.run(sprintf('mkdir -p %s/%s', @dir, dir))
-    end
-
-    dirs_actual_sensitive = @app.dirs(@dir, 'f*', false)
-
-    dirs_actual_sensitive.each do |dir|
-      dir = dir.gsub(/#{@dir}/, '')
-      assert(dirs_expected_sensitive.member?(dir))
-    end
-
-    dirs_actual_insensitive = @app.dirs(@dir, 'f*', true)
-
-    dirs_actual_insensitive.each do |dir|
-      dir = dir.gsub(/#{@dir}/, '')
-      assert(dirs_expected_insensitive.member?(dir))
-    end
-
-  end
-
   def teardown
     @app.run(sprintf('rm -rf %s', @dir))
   end

data/test/functional/test_get.rb

@@ -45,8 +45,7 @@ class TestGet < Test::Unit::TestCase
   def test_remote_path_dne
 
     assert_raise Rouster::FileTransferError do
-      res = @app.get(@kb_dne_location, @kg_local_location)
-      assert_equal(false, res)
+      @app.get(@kb_dne_location, @kg_local_location)
     end
 
     assert_equal(false, File.file?(@kg_local_location), 'known bad remote file path DNE')
@@ -55,7 +54,7 @@ class TestGet < Test::Unit::TestCase
   def test_with_suspended_machine
     @app.suspend()
 
-    #assert_raise Rouster::SSHConnectionError do <-- this is what we want when the connection is bad, as opposed to permission/disk space issues
+    #assert_raise Rouster::SSHConnectionError do <-- why was this ever used?
     assert_raise Rouster::FileTransferError do
       @app.get(@kg_remote_location, @kg_local_location)
     end
@@ -64,13 +63,10 @@ class TestGet < Test::Unit::TestCase
   end
 
   def teardown
-    File.delete(@kg_local_location) if File.file?(@kg_local_location).true?
-  end
-
-  def self.shutdown
     # TODO we should suspend instead if any test failed for triage
-    #@app.suspend()
-    #@ppm.suspend()
-  end
+    #@app.destroy()
+    #@ppm.destroy()
 
+    File.delete(@kg_local_location) if File.file?(@kg_local_location).true?
+  end
 end

data/test/functional/test_inspect.rb

@@ -21,7 +21,7 @@ class TestInspect < Test::Unit::TestCase
     assert_match(/status/, res)
     assert_match(/sudo\[true\]/, res)
     assert_match(/vagrantfile/, res)
-    assert_match(/verbosity console\[3\] \/ log\[2/, res)
+    assert_match(/verbosity\[4\]/, res)
   end
 
   def teardown

data/test/functional/test_is_file.rb

@@ -22,9 +22,8 @@ class TestIsFile < Test::Unit::TestCase
     @file_other_rwx = sprintf('%s/other', @dir_tmp)
     @file_644       = sprintf('%s/sixfourfour', @dir_tmp)
     @file_755       = sprintf('%s/sevenfivefive', @dir_tmp)
-    @symlink        = sprintf('%s/symlinking', @dir_tmp)
 
-    @files = [@file_user_rwx, @file_group_rwx, @file_other_rwx, @file_644, @file_755, @symlink]
+    @files = [@file_user_rwx, @file_group_rwx, @file_other_rwx, @file_644, @file_755]
   end
 
   def test_user
@@ -42,8 +41,6 @@ class TestIsFile < Test::Unit::TestCase
     assert_equal(false, @app.is_readable?(@file_user_rwx,   'o'))
     assert_equal(false, @app.is_writeable?(@file_user_rwx,  'o'))
     assert_equal(false, @app.is_executable?(@file_user_rwx, 'o'))
-
-    assert_equal(false, @app.is_symlink?(@file_755))
   end
 
   def test_group
@@ -61,8 +58,6 @@ class TestIsFile < Test::Unit::TestCase
     assert_equal(false, @app.is_readable?(@file_group_rwx,   'o'))
     assert_equal(false, @app.is_writeable?(@file_group_rwx,  'o'))
     assert_equal(false, @app.is_executable?(@file_group_rwx, 'o'))
-
-    assert_equal(false, @app.is_symlink?(@file_755))
   end
 
   def test_other
@@ -81,7 +76,6 @@ class TestIsFile < Test::Unit::TestCase
     assert_equal(true, @app.is_writeable?(@file_other_rwx,  'o'))
     assert_equal(true, @app.is_executable?(@file_other_rwx, 'o'))
 
-    assert_equal(false, @app.is_symlink?(@file_755))
   end
 
   def test_644
@@ -99,8 +93,6 @@ class TestIsFile < Test::Unit::TestCase
     assert_equal(true, @app.is_readable?(@file_644,    'o'))
     assert_equal(false, @app.is_writeable?(@file_644,  'o'))
     assert_equal(false, @app.is_executable?(@file_644, 'o'))
-
-    assert_equal(false, @app.is_symlink?(@file_755))
   end
 
   def test_755
@@ -118,14 +110,6 @@ class TestIsFile < Test::Unit::TestCase
     assert_equal(true, @app.is_readable?(@file_755,   'o'))
     assert_equal(false, @app.is_writeable?(@file_755, 'o'))
     assert_equal(true, @app.is_executable?(@file_755, 'o'))
-
-    assert_equal(false, @app.is_symlink?(@file_755))
-  end
-
-  def test_symlink
-    @app.run("ln -s /etc/hosts #{@symlink}")
-
-    assert_equal(true, @app.is_symlink?(@symlink))
   end
 
   def teardown