summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2015-01-27 13:50:41 -0800
committerBryan McLellan <btm@loftninjas.org>2015-01-27 13:50:41 -0800
commit194f49bdb7737e0591271ba95021997e90379c5d (patch)
tree7444772eb5a0eed7d3de50333c9bf885ba701937
parentb1dedaa6e1c3b8f70c16895c7c221286409f9564 (diff)
parent598886e9774f64f06fbe731f0e1aa3875f419919 (diff)
downloadchef-194f49bdb7737e0591271ba95021997e90379c5d.tar.gz
Merge pull request #2662 from chef/btm/appveyor12
appveyor for 12-stable
-rw-r--r--appveyor.yml32
-rw-r--r--spec/stress/win32/file_spec.rb4
-rw-r--r--spec/unit/application/client_spec.rb1
3 files changed, 35 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..d5751e0054
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,32 @@
+version: "12-stable-{build}"
+
+os: Windows Server 2012
+platform:
+ - x64
+
+environment:
+ matrix:
+ - ruby_version: "200"
+
+clone_folder: c:\projects\chef
+clone_depth: 1
+skip_tags: true
+branches:
+ only:
+ - master
+ - 12-stable
+
+install:
+ - winrm quickconfig -q
+ - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+ - echo %PATH%
+ - ruby --version
+ - gem --version
+ - gem install bundler --quiet --no-ri --no-rdoc
+ - bundler --version
+
+build_script:
+ - bundle install
+
+test_script:
+ - bundle exec rake spec
diff --git a/spec/stress/win32/file_spec.rb b/spec/stress/win32/file_spec.rb
index caeab352f7..0341f62d30 100644
--- a/spec/stress/win32/file_spec.rb
+++ b/spec/stress/win32/file_spec.rb
@@ -24,12 +24,12 @@ describe 'Chef::ReservedNames::Win32::File', :windows_only do
@path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "old_home_dir", "my-dot-emacs"))
end
- it "should not leak significant memory" do
+ it "should not leak significant memory", :volatile do
test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
test.should_not leak_memory(:warmup => 50000, :iterations => 50000)
end
- it "should not leak handles" do
+ it "should not leak handles", :volatile do
test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
test.should_not leak_handles(:warmup => 50, :iterations => 100)
end
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index a91209cfee..2f6bd1b21e 100644
--- a/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
@@ -50,6 +50,7 @@ describe Chef::Application::Client, "reconfigure" do
context "when interval is given" do
before do
Chef::Config[:interval] = 600
+ allow(Chef::Platform).to receive(:windows?).and_return(false)
end
it "should terminate with message" do