vagrantup 1.0.7 → 1.1.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/unit/vagrant/action/environment_test.rb

@@ -1,16 +0,0 @@
-require File.expand_path("../../../base", __FILE__)
-
-describe Vagrant::Action::Environment do
-  let(:instance) { described_class.new }
-
-  it "should be a hash" do
-    instance.should be_empty
-    instance["foo"] = "bar"
-    instance["foo"].should == "bar"
-  end
-
-  it "should be a hash accessible by string or symbol" do
-    instance["foo"] = "bar"
-    instance[:foo].should == "bar"
-  end
-end

data/test/unit/vagrant/config/base_test.rb

@@ -1,48 +0,0 @@
-require File.expand_path("../../../base", __FILE__)
-
-describe Vagrant::Config::Base do
-  include_context "unit"
-
-  let(:foo_class) do
-    Class.new(described_class) do
-      attr_accessor :one
-      attr_accessor :two
-    end
-  end
-
-  it "should merge by default by simply copying each instance variable" do
-    one = foo_class.new
-    one.one = 2
-    one.two = 1
-
-    two = foo_class.new
-    two.two = 5
-
-    result = one.merge(two)
-    result.one.should == 2
-    result.two.should == 5
-  end
-
-  it "doesn't merge values that start with a double underscore" do
-    bar_class = Class.new(foo_class) do
-      class_variable_set(:@@counter, 0)
-
-      def initialize
-        @__test = self.class.send(:class_variable_get, :@@counter)
-        self.class.send(:class_variable_set, :@@counter, @__test + 1)
-      end
-    end
-
-    one = bar_class.new
-    one.one = 2
-    one.two = 1
-
-    two = bar_class.new
-    two.two = 5
-
-    # Verify the counters
-    one.instance_variable_get(:@__test).should == 0
-    two.instance_variable_get(:@__test).should == 1
-    one.merge(two).instance_variable_get(:@__test).should == 2
-  end
-end

data/test/unit/vagrant/config/ssh_test.rb

@@ -1,17 +0,0 @@
-require File.expand_path("../../../base", __FILE__)
-
-describe Vagrant::Config::SSHConfig do
-  include_context "unit"
-
-  [:forward_agent, :forward_x11].each do |bool_setting|
-    it "merges boolean #{bool_setting} properly" do
-      a = described_class.new
-      a.send("#{bool_setting}=", true)
-
-      b = described_class.new
-
-      c = a.merge(b)
-      c.send(bool_setting).should be
-    end
-  end
-end

data/test/unit/vagrant/config/top_test.rb

@@ -1,69 +0,0 @@
-require File.expand_path("../../../base", __FILE__)
-
-require "vagrant/registry"
-
-describe Vagrant::Config::Top do
-  include_context "unit"
-
-  let(:registry) { Vagrant::Registry.new }
-  let(:instance) { described_class.new(registry) }
-
-  it "should load in the proper config class" do
-    registry.register(:foo, Object)
-
-    instance.foo.should be_kind_of(Object)
-  end
-
-  it "should load the proper config class only once" do
-    registry.register(:foo, Object)
-
-    obj = instance.foo
-    instance.foo.should eql(obj)
-  end
-
-  it "still raises a method missing error if invalid key" do
-    expect { instance.foo }.to raise_error(NoMethodError)
-  end
-
-  describe "merging" do
-    let(:foo_class) do
-      Class.new do
-        attr_accessor :one
-        attr_accessor :two
-
-        def merge(other)
-          result = self.class.new
-          result.one = other.one || one
-          result.two = other.two || two
-          result
-        end
-      end
-    end
-
-    it "merges each key by calling `merge` on the class" do
-      registry.register(:foo, foo_class)
-
-      instance.foo.one = 1
-      instance.foo.two = 2
-
-      another = described_class.new(registry)
-      another.foo.one = 2
-
-      result = instance.merge(another)
-      result.foo.one.should == 2
-      result.foo.two.should == 2
-    end
-
-    it "merges keys that aren't in the source instance" do
-      reg = Vagrant::Registry.new
-      reg.register(:foo, foo_class)
-
-      another = described_class.new(reg)
-      another.foo.one = 2
-
-      result = instance.merge(another)
-      result.foo.one.should == 2
-      result.foo.two.should be_nil
-    end
-  end
-end

data/test/unit/vagrant/config/vm_test.rb

@@ -1,71 +0,0 @@
-require File.expand_path("../../../base", __FILE__)
-
-describe Vagrant::Config::VMConfig do
-  include_context "unit"
-
-  it "merges by appending forwarded ports" do
-    a = described_class.new
-    a.forward_port 80, 8080
-
-    b = described_class.new
-    b.forward_port 100, 1000
-
-    c = a.merge(b)
-    c.forwarded_ports.length.should == 2
-    c.forwarded_ports[0][:guestport].should == 80
-    c.forwarded_ports[0][:hostport].should == 8080
-    c.forwarded_ports[1][:guestport].should == 100
-    c.forwarded_ports[1][:hostport].should == 1000
-  end
-
-  it "merges by merging shared folders" do
-    a = described_class.new
-    a.share_folder "a", "/guest", "/host"
-    a.share_folder "b", "/guest", "/host"
-
-    b = described_class.new
-    b.share_folder "c", "/guest", "/host"
-
-    c = a.merge(b)
-    c.shared_folders.has_key?("a").should be
-    c.shared_folders.has_key?("b").should be
-    c.shared_folders.has_key?("c").should be
-  end
-
-  it "merges by appending networks" do
-    a = described_class.new
-    a.network :hostonly, "192.168.33.10"
-
-    b = described_class.new
-    b.network :hostonly, "192.168.33.11"
-
-    c = a.merge(b)
-    c.networks.length.should == 2
-    c.networks[0].should == [:hostonly, ["192.168.33.10"]]
-    c.networks[1].should == [:hostonly, ["192.168.33.11"]]
-  end
-
-  it "merges by appending provisioners" do
-    a = described_class.new
-    a.provision :foo
-
-    b = described_class.new
-    b.provision :bar
-
-    c = a.merge(b)
-    c.provisioners.length.should == 2
-    c.provisioners[0].shortcut.should == :foo
-    c.provisioners[1].shortcut.should == :bar
-  end
-
-  it "merges by appending customizations" do
-    a = described_class.new
-    a.customize "a"
-
-    b = described_class.new
-    b.customize "b"
-
-    c = a.merge(b)
-    c.customizations.should == ["a", "b"]
-  end
-end