vagrant 1.0.7 → 1.5.0

data/test/buildbot/requirements.txt

@@ -1,4 +0,0 @@
-buildbot==0.8.5
-buildbot-slave==0.8.5
-pytest==2.1.0
-vendor/choices-0.4.0.tar.gz

data/test/buildbot/scripts/deploy.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# This shell script deploys the buildmaster by downloading an
-# up-to-date tar.gz from GitHub and setting up the proper environment.
-
-#----------------------------------------------------------------------
-# Update the source
-#----------------------------------------------------------------------
-# Download the Vagrant source, extract it
-cd /tmp
-rm -rf vagrant
-rm -rf mitchellh-vagrant-*
-wget https://github.com/mitchellh/vagrant/tarball/master -O vagrant.tar.gz
-tar xvzf vagrant.tar.gz
-mv mitchellh-vagrant-* vagrant
-
-# Move the code into place
-cp -R vagrant/test/buildbot/* /srv/buildmaster/
-
-# Setup the virtualenv
-cd /srv/buildmaster
-virtualenv --no-site-packages env
-
-# Activate the environment
-. env/bin/activate
-
-# Install dependencies
-pip install -r requirements.txt
-
-#----------------------------------------------------------------------
-# Update the buildmaster
-#----------------------------------------------------------------------
-# Setup environmental variables that are required
-export BUILDBOT_CONFIG=/etc/buildmaster/master.cfg
-export PYTHONPATH=/srv/buildmaster
-
-# Restart the buildmaster
-buildbot restart master/

data/test/buildbot/scripts/setup.sh

@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# This shell script installs and prepares all the software necessary
-# to run the build master. This script is expected to be run as root.
-# This script is made to be run only on Ubuntu 10.04 LTS at the moment.
-
-# Update the source list
-apt-get update
-
-# Install the basic sysadmin stuff
-apt-get install -y htop
-
-# Fix the mountall bug in the AMI
-sed -i -e 's/nobootwait,//' /etc/fstab
-
-#----------------------------------------------------------------------
-# Python Setup
-#----------------------------------------------------------------------
-# Install Python and pip
-apt-get install -y python python-dev python-setuptools
-easy_install pip
-
-# Install virtualenv
-pip install virtualenv
-
-#----------------------------------------------------------------------
-# Deploy Setup
-#----------------------------------------------------------------------
-# Install Git, which is used for all the deploys of the build master
-apt-get install -y git-core
-
-# Create the user/group for the buildmaster
-groupadd buildmaster
-useradd -d /home/buildmaster -g buildmaster -s /bin/bash buildmaster
-mkdir /home/buildmaster
-chown -R buildmaster:buildmaster /home/buildmaster
-
-# Make the folder which will contain the buildmaster code
-mkdir -p /srv/buildmaster
-chown buildmaster:buildmaster /srv/buildmaster
-
-# Make the folder which will contain the configuration for the
-# buildmaster
-mkdir -p /etc/buildmaster
-chown buildmaster:buildmaster /etc/buildmaster
-
-#----------------------------------------------------------------------
-# Nginx Setup
-#----------------------------------------------------------------------
-# Install Nginx
-apt-get install -y nginx
-
-# Setup the basic directories
-mkdir -p /etc/nginx/conf.d
-mkdir -p /etc/nginx/sites-available
-mkdir -p /etc/nginx/sites-enabled
-
-# Setup the configuration
-cat <<EOF > /etc/nginx/nginx.conf
-user             www-data;
-worker_processes 1;
-
-# Raise the limit on open file descriptors
-worker_rlimit_nofile 30000;
-
-error_log /var/log/nginx/error.log;
-pid       /var/run/nginx.pid;
-
-events {
-    worker_connections 1024;
-    use epoll;
-}
-
-http {
-    include      /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    access_log   /var/log/nginx/access.log;
-
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-
-    keepalive_timeout 65;
-
-    include /etc/nginx/conf.d/*.conf;
-    include /etc/nginx/sites-enabled/*;
-}
-EOF
-
-# Setup the buildbot site
-cat <<EOF > /etc/nginx/sites-available/buildmaster.conf
-server {
-  listen 80;
-
-  location / {
-    proxy_pass http://localhost:8000;
-  }
-}
-EOF
-
-# Activate the buildbot site, remove the default
-rm /etc/nginx/sites-enabled/default
-ln -f -s /etc/nginx/sites-available/buildmaster.conf /etc/nginx/sites-enabled/buildmaster.conf
-
-# Restart nginx
-/etc/init.d/nginx restart

data/test/buildbot/slave/buildbot.tac

@@ -1,43 +0,0 @@
-import os
-
-from twisted.application import service
-from buildslave.bot import BuildSlave
-
-from buildbot_config.config.slave import options
-
-basedir = r'.'
-rotateLength = 10000000
-maxRotatedFiles = 10
-
-# if this is a relocatable tac file, get the directory containing the TAC
-if basedir == '.':
-    import os.path
-    basedir = os.path.abspath(os.path.dirname(__file__))
-
-# note: this line is matched against to check that this is a buildslave
-# directory; do not edit it.
-application = service.Application('buildslave')
-
-try:
-  from twisted.python.logfile import LogFile
-  from twisted.python.log import ILogObserver, FileLogObserver
-  logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength,
-                                 maxRotatedFiles=maxRotatedFiles)
-  application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
-except ImportError:
-  # probably not yet twisted 8.2.0 and beyond, can't set log yet
-  pass
-
-buildmaster_host = options.master_host
-port = options.master_port
-slavename = options.name
-passwd = options.password
-keepalive = 600
-usepty = 0
-umask = None
-maxdelay = 300
-
-s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir,
-               keepalive, usepty, umask=umask, maxdelay=maxdelay)
-s.setServiceParent(application)
-

data/test/buildbot/slave/info/admin

@@ -1 +0,0 @@
-Buildslave Admin <foo@bar.com>

data/test/buildbot/slave/info/host

@@ -1 +0,0 @@
-Please put a description of this build host here

data/test/buildbot/tests/master/test_slaves.py

@@ -1,41 +0,0 @@
-from buildbot.buildslave import BuildSlave
-
-from buildbot_config.master.slaves import (
-    BuildSlavesFromSlaveConfigs,
-    SlaveConfig,
-    SlaveListFromConfig)
-
-class TestSlaveListFromConfig(object):
-    Klass = SlaveListFromConfig
-
-    def test_parse_single(self):
-        """
-        Tests that the config parser can parse a single
-        slave.
-        """
-        instance = self.Klass("foo:bar")
-        assert 1 == len(instance)
-        assert SlaveConfig("foo", "bar") == instance[0]
-
-    def test_parse_multiple(self):
-        """
-        Tests that the config parser can parse multiple
-        slaves.
-        """
-        instance = self.Klass("foo:bar,bar:baz")
-        expected = [SlaveConfig("foo", "bar"), SlaveConfig("bar", "baz")]
-
-        assert 2 == len(instance)
-        assert expected == instance
-
-class TestBuildSlavesFromSlaveConfig(object):
-    Klass = BuildSlavesFromSlaveConfigs
-
-    def test_returns_build_slaves(self):
-        """
-        Tests that build slaves are properly returned for each
-        slave configuration.
-        """
-        instance = self.Klass([SlaveConfig("foo", "bar")])
-        assert 1 == len(instance)
-        assert isinstance(instance[0], BuildSlave)

data/test/config/acceptance_boxes.yml

@@ -1,7 +0,0 @@
-# This is the list of required boxes for acceptance tests, and
-# their locations. The locations are used to download the boxes
-# on the fly, if necessary. Additionally, a SHA1 checksum is
-# given to determine if the box needs to be updated.
-- name: default
-  url: http://files.vagrantup.com/test/boxes/default.box
-  checksum: 1b0a7eb6e152c5b43f45485654ff4965a7f9f604

data/test/support/isolated_environment.rb

@@ -1,46 +0,0 @@
-require "fileutils"
-require "pathname"
-
-require "log4r"
-
-require "support/tempdir"
-
-# This class manages an isolated environment for Vagrant to
-# run in. It creates a temporary directory to act as the
-# working directory as well as sets a custom home directory.
-#
-# This class also provides various helpers to create Vagrantfiles,
-# boxes, etc.
-class IsolatedEnvironment
-  attr_reader :homedir
-  attr_reader :workdir
-
-  # Initializes an isolated environment. You can pass in some
-  # options here to configure runing custom applications in place
-  # of others as well as specifying environmental variables.
-  #
-  # @param [Hash] apps A mapping of application name (such as "vagrant")
-  #   to an alternate full path to the binary to run.
-  # @param [Hash] env Additional environmental variables to inject
-  #   into the execution environments.
-  def initialize
-    @logger = Log4r::Logger.new("test::isolated_environment")
-
-    # Create a temporary directory for our work
-    @tempdir = Tempdir.new("vagrant")
-    @logger.info("Initialize isolated environment: #{@tempdir.path}")
-
-    # Setup the home and working directories
-    @homedir = Pathname.new(File.join(@tempdir.path, "home"))
-    @workdir = Pathname.new(File.join(@tempdir.path, "work"))
-
-    @homedir.mkdir
-    @workdir.mkdir
-  end
-
-  # This closes the environment by cleaning it up.
-  def close
-    @logger.info("Removing isolated environment: #{@tempdir.path}")
-    FileUtils.rm_rf(@tempdir.path)
-  end
-end

data/test/support/tempdir.rb

@@ -1,34 +0,0 @@
-require 'fileutils'
-require 'tempfile'
-
-# This class provides an easy way of creating a temporary
-# directory and having it removed when the application exits.
-#
-# TODO: This class doesn't currently delete the temporary
-# directory on exit.
-class Tempdir
-  attr_reader :path
-
-  def initialize(basename="vagrant")
-    @path = nil
-
-    # Loop and attempt to create a temporary directory until
-    # it succeeds.
-    while @path.nil?
-      file = Tempfile.new(basename)
-      @path = file.path
-      file.unlink
-
-      begin
-        Dir.mkdir(@path)
-      rescue
-        @path = nil
-      end
-    end
-  end
-
-  # This deletes the temporary directory.
-  def unlink
-    FileUtils.rm_rf(@path)
-  end
-end

data/test/unit/base.rb

@@ -1,21 +0,0 @@
-require "rubygems"
-require "rspec/autorun"
-
-# Require Vagrant itself so we can reference the proper
-# classes to test.
-require "vagrant"
-
-# Add the test directory to the load path
-$:.unshift File.expand_path("../../", __FILE__)
-
-# Load in helpers
-require "unit/support/shared/base_context"
-
-# Do not buffer output
-$stdout.sync = true
-$stderr.sync = true
-
-# Configure RSpec
-RSpec.configure do |c|
-  c.expect_with :rspec, :stdlib
-end

data/test/unit/support/isolated_environment.rb

@@ -1,47 +0,0 @@
-require "fileutils"
-require "pathname"
-
-require "log4r"
-
-require "support/isolated_environment"
-
-module Unit
-  class IsolatedEnvironment < ::IsolatedEnvironment
-    def create_vagrant_env(options=nil)
-      options = {
-        :cwd => @workdir,
-        :home_path => @homedir
-      }.merge(options || {})
-
-      Vagrant::Environment.new(options)
-    end
-
-    # This creates a file in the isolated environment. By default this file
-    # will be created in the working directory of the isolated environment.
-    def file(name, contents)
-      @workdir.join(name).open("w+") do |f|
-        f.write(contents)
-      end
-    end
-
-    def vagrantfile(contents, root=nil)
-      root ||= @workdir
-      root.join("Vagrantfile").open("w+") do |f|
-        f.write(contents)
-      end
-    end
-
-    def box(name, vagrantfile_contents="")
-      box_dir = boxes_dir.join(name)
-      box_dir.mkpath
-      vagrantfile(vagrantfile_contents, box_dir)
-      box_dir
-    end
-
-    def boxes_dir
-      dir = @homedir.join("boxes")
-      dir.mkpath
-      dir
-    end
-  end
-end

data/test/unit/support/shared/base_context.rb

@@ -1,30 +0,0 @@
-require "tempfile"
-
-require "unit/support/isolated_environment"
-
-shared_context "unit" do
-  # This creates an isolated environment so that Vagrant doesn't
-  # muck around with your real system during unit tests.
-  #
-  # The returned isolated environment has a variety of helper
-  # methods on it to easily create files, Vagrantfiles, boxes,
-  # etc.
-  def isolated_environment
-    env = Unit::IsolatedEnvironment.new
-    yield env if block_given?
-    env
-  end
-
-  # This helper creates a temporary file and returns a Pathname
-  # object pointed to it.
-  def temporary_file(contents=nil)
-    f = Tempfile.new("vagrant-unit")
-
-    if contents
-      f.write(contents)
-      f.flush
-    end
-
-    return Pathname.new(f.path)
-  end
-end

data/test/unit/vagrant/action/builder_test.rb

@@ -1,156 +0,0 @@
-require File.expand_path("../../../base", __FILE__)
-
-describe Vagrant::Action::Builder do
-  let(:data) { { :data => [] } }
-  let(:instance) { described_class.new }
-
-  # This returns a proc that can be used with the builder
-  # that simply appends data to an array in the env.
-  def appender_proc(data)
-    Proc.new { |env| env[:data] << data }
-  end
-
-  context "basic `use`" do
-    it "should add items to the stack and make them callable" do
-      data = {}
-      proc = Proc.new { |env| env[:data] = true }
-
-      instance.use proc
-      instance.call(data)
-
-      data[:data].should == true
-    end
-
-    it "should be able to add multiple items" do
-      data = {}
-      proc1 = Proc.new { |env| env[:one] = true }
-      proc2 = Proc.new { |env| env[:two] = true }
-
-      instance.use proc1
-      instance.use proc2
-      instance.call(data)
-
-      data[:one].should == true
-      data[:two].should == true
-    end
-
-    it "should be able to add another builder" do
-      data  = {}
-      proc1 = Proc.new { |env| env[:one] = true }
-
-      # Build the first builder
-      one   = described_class.new
-      one.use proc1
-
-      # Add it to this builder
-      two   = described_class.new
-      two.use one
-
-      # Call the 2nd and verify results
-      two.call(data)
-      data[:one].should == true
-    end
-
-    it "should be able to set additional variables when using" do
-      data  = { }
-      proc1 = Proc.new { |env| env[:data] += 1 }
-
-      # Build the first builder
-      one   = described_class.new
-      one.use proc1, :data => 5
-      one.call(data)
-
-      data[:data].should == 6
-    end
-  end
-
-  context "inserting" do
-    it "can insert at an index" do
-      instance.use appender_proc(1)
-      instance.insert(0, appender_proc(2))
-      instance.call(data)
-
-      data[:data].should == [2, 1]
-    end
-
-    it "can insert next to a previous object" do
-      proc2 = appender_proc(2)
-      instance.use appender_proc(1)
-      instance.use proc2
-      instance.insert(proc2, appender_proc(3))
-      instance.call(data)
-
-      data[:data].should == [1, 3, 2]
-    end
-
-    it "can insert before" do
-      instance.use appender_proc(1)
-      instance.insert_before 0, appender_proc(2)
-      instance.call(data)
-
-      data[:data].should == [2, 1]
-    end
-
-    it "can insert after" do
-      instance.use appender_proc(1)
-      instance.use appender_proc(3)
-      instance.insert_after 0, appender_proc(2)
-      instance.call(data)
-
-      data[:data].should == [1, 2, 3]
-    end
-
-    it "raises an exception if an invalid object given" do
-      expect { instance.insert_after "object", appender_proc(1) }.
-        to raise_error(RuntimeError)
-    end
-  end
-
-  context "replace" do
-    it "can replace an object" do
-      proc1 = appender_proc(1)
-      proc2 = appender_proc(2)
-
-      instance.use proc1
-      instance.replace proc1, proc2
-      instance.call(data)
-
-      data[:data].should == [2]
-    end
-
-    it "can replace by index" do
-      proc1 = appender_proc(1)
-      proc2 = appender_proc(2)
-
-      instance.use proc1
-      instance.replace 0, proc2
-      instance.call(data)
-
-      data[:data].should == [2]
-    end
-  end
-
-  context "deleting" do
-    it "can delete by object" do
-      proc1 = appender_proc(1)
-
-      instance.use proc1
-      instance.use appender_proc(2)
-      instance.delete proc1
-      instance.call(data)
-
-      data[:data].should == [2]
-    end
-
-    it "can delete by index" do
-      proc1 = appender_proc(1)
-
-      instance.use proc1
-      instance.use appender_proc(2)
-      instance.delete 0
-      instance.call(data)
-
-      data[:data].should == [2]
-    end
-  end
-end