Permalink
Browse files

Merge remote-tracking branch 'staging/master'

  • Loading branch information...
2 parents fd66194 + a104078 commit f96cce2ccfb61fd5600fdee023a1cd39e6516105 Patrick Bozeman committed Aug 2, 2011
@@ -1,7 +1,5 @@
# Copyright (c) 2009-2011 VMware, Inc.
-$:.unshift(File.dirname(__FILE__))
-
-require 'spec_helper'
+require File.join(File.dirname(__FILE__), 'spec_helper')
require 'digest/sha1'
require 'fileutils'
@@ -1,7 +1,5 @@
# Copyright (c) 2009-2011 VMware, Inc.
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'spec_helper'
+require File.join(File.dirname(__FILE__), 'spec_helper')
require 'dea/agent'
@@ -2,7 +2,9 @@ ENV["BUNDLE_GEMFILE"] = File.expand_path("../../cloud_controller/Gemfile", __FIL
require 'rake'
desc "Run specs"
-task "spec" => ["prepare_test_db","bundler:install:test","test:spec"]
+
+# TODO - Add back in 'prepare_test_db' when tests are re-enabled
+task "spec" => ["bundler:install:test","test:spec"]
# FIXME - This does not honor the test db set in
# config/health_manager.yml
@@ -11,6 +11,7 @@
#TODO: test that droplets have a chance to restart
describe HealthManager do
+
def build_user_and_app
@user = ::User.find_by_email('test@example.com')
unless @user
@@ -33,8 +34,8 @@ def build_user_and_app
end
after(:all) do
- ::User.destroy_all
- ::App.destroy_all
+ #::User.destroy_all
+ #::App.destroy_all
end
before(:each) do
@@ -70,8 +71,7 @@ def build_user_and_app
NATS.should_receive(:publish).with('vcap.component.announce', /\{.*\}/)
end
- it "should not do anything when everything is running" do
-
+ pending "should not do anything when everything is running" do
EM.run do
@hm.stub!(:register_error_handler)
@hm.run
Submodule tests updated from b3eee1 to 4c1e54

0 comments on commit f96cce2

Please sign in to comment.