test/support/integration_test.rb in knife-solo-0.3.0.pre3 vs test/support/integration_test.rb in knife-solo-0.3.0.pre4

- old
+ new

@@ -37,11 +37,11 @@ # Sets up a kitchen directory to work in def setup @kitchen = $base_dir.join('support', 'kitchens', self.class.to_s) FileUtils.remove_entry_secure(@kitchen, true) @kitchen.dirname.mkpath - system "knife solo init #{@kitchen} >> #{log_file}" + system "knife solo init #{@kitchen} --no-berkshelf --no-librarian >> #{log_file}" @start_dir = Dir.pwd Dir.chdir(@kitchen) prepare_server end @@ -50,11 +50,11 @@ Dir.chdir(@start_dir) end # Writes out the given node hash as a json file def write_nodefile(node) - write_json_file("nodes/#{server.public_ip_address}.json", node) + write_json_file("nodes/#{server.dns_name}.json", node) end # Writes out an object to the given file as JSON def write_json_file(file, data) FileUtils.mkpath(File.dirname(file)) @@ -80,10 +80,10 @@ runner.key_file end # The ssh-style connection string used to connect to the current node def connection_string - "-i #{key_file} #{user}@#{server.public_ip_address}" + "-i #{key_file} #{user}@#{server.dns_name}" end # Asserts that a knife command is successful def assert_knife_command(subcommand) system "knife #{subcommand} #{connection_string} -VV >> #{log_file}"