You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by dk...@apache.org on 2013/06/06 13:24:47 UTC
git commit: Fix failing travis builds - also DTACLOUD-562
Updated Branches:
refs/heads/master 556294671 -> e569d391d
Fix failing travis builds - also DTACLOUD-562
https://travis-ci.org/deltacloud/deltacloud-core/builds/7731674
https://travis-ci.org/deltacloud/deltacloud-core/jobs/7763133
https://issues.apache.org/jira/browse/DTACLOUD-562
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/e569d391
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/e569d391
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/e569d391
Branch: refs/heads/master
Commit: e569d391d9bac2ac6af11646f0f86dea005fe3de
Parents: 5562946
Author: marios <ma...@redhat.com>
Authored: Wed Jun 5 12:01:58 2013 +0300
Committer: marios <ma...@redhat.com>
Committed: Wed Jun 5 12:03:39 2013 +0300
----------------------------------------------------------------------
.../drivers/mock/data/instances/inst2.yml | 2 +-
server/tests/cimi/collections/machines_test.rb | 4 ++--
server/tests/drivers/mock/images_test.rb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/e569d391/server/lib/deltacloud/drivers/mock/data/instances/inst2.yml
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/instances/inst2.yml b/server/lib/deltacloud/drivers/mock/data/instances/inst2.yml
index 301f1cf..f409f5b 100644
--- a/server/lib/deltacloud/drivers/mock/data/instances/inst2.yml
+++ b/server/lib/deltacloud/drivers/mock/data/instances/inst2.yml
@@ -2,7 +2,7 @@
:instance_profile: !ruby/object:Deltacloud::InstanceProfile
id: m1-large
:realm_id: us
-:owner_id: anotheruser
+:owner_id: mockuser
:public_addresses:
- !ruby/object:Deltacloud::InstanceAddress
address: img1.inst2.public.com
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/e569d391/server/tests/cimi/collections/machines_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/cimi/collections/machines_test.rb b/server/tests/cimi/collections/machines_test.rb
index 530c52f..9c411b1 100644
--- a/server/tests/cimi/collections/machines_test.rb
+++ b/server/tests/cimi/collections/machines_test.rb
@@ -111,8 +111,8 @@ describe CIMI::Collections::Machines do
get root_url("/machines?$filter=name!='MockUserInstance'")
status.must_equal 200
(xml/'Collection/Machine').wont_be_empty
- (xml/'Collection/Machine').size.must_equal 1
- xml.at('Collection/count').text.must_equal '1'
+ (xml/'Collection/Machine').size.must_equal 3
+ xml.at('Collection/count').text.must_equal '3'
xml.at('Collection/Machine/name').text.must_equal 'Mock Instance With Profile Change'
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/e569d391/server/tests/drivers/mock/images_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/mock/images_test.rb b/server/tests/drivers/mock/images_test.rb
index 6f8ab8b..e04b22e 100644
--- a/server/tests/drivers/mock/images_test.rb
+++ b/server/tests/drivers/mock/images_test.rb
@@ -43,7 +43,7 @@ describe 'MockDriver Images' do
@driver.image(:id => 'img1-test').id.must_equal 'img1-test'
@driver.image(:id => 'img1-test').name.must_equal 'img1-test'
@driver.image(:id => 'img1-test').description.must_equal 'Test1'
- Proc.new { @driver.create_image(:id => 'unknown-instance', :name => 'test') }.must_raise Deltacloud::Exceptions::BackendError, 'CreateImageNotSupported'
+ Proc.new { @driver.create_image(:id => 'unknown-instance', :name => 'test') }.must_raise Deltacloud::Exceptions::ObjectNotFound
@driver.image(:id => 'test').must_be_nil
end