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/07/01 10:42:19 UTC
[1/2] git commit: Mock: Fixed wrong count of instances in tests
Updated Branches:
refs/heads/master ed711069f -> a4a18cd81
Mock: Fixed wrong count of instances in tests
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/034eef26
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/034eef26
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/034eef26
Branch: refs/heads/master
Commit: 034eef264819d4f9536b59e35e7629183d4f7acf
Parents: ed71106
Author: Michal Fojtik <mf...@redhat.com>
Authored: Tue Jun 18 13:15:54 2013 +0200
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Mon Jul 1 18:41:53 2013 +1000
----------------------------------------------------------------------
server/tests/drivers/mock/instances_test.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/034eef26/server/tests/drivers/mock/instances_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/mock/instances_test.rb b/server/tests/drivers/mock/instances_test.rb
index 555019d..abe35f1 100644
--- a/server/tests/drivers/mock/instances_test.rb
+++ b/server/tests/drivers/mock/instances_test.rb
@@ -25,7 +25,7 @@ describe 'MockDriver Instances' do
@driver.instances(:id => 'inst1').must_be_kind_of Array
@driver.instances(:id => 'inst1').size.must_equal 1
@driver.instances(:id => 'inst1').first.id.must_equal 'inst1'
- @driver.instances(:owner_id => 'mockuser').size.must_equal 3
+ @driver.instances(:owner_id => 'mockuser').size.must_equal 4
@driver.instances(:owner_id => 'mockuser').first.owner_id.must_equal 'mockuser'
@driver.instances(:id => 'unknown').must_be_empty
end
[2/2] git commit: Mock: Raise NotFound when instance does not exists
when creating the Image
Posted by dk...@apache.org.
Mock: Raise NotFound when instance does not exists when creating the Image
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a4a18cd8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a4a18cd8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a4a18cd8
Branch: refs/heads/master
Commit: a4a18cd81d36c226ba880260c4509c9161909937
Parents: 034eef2
Author: Michal Fojtik <mf...@redhat.com>
Authored: Tue Jun 18 13:15:33 2013 +0200
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Mon Jul 1 18:41:54 2013 +1000
----------------------------------------------------------------------
server/lib/deltacloud/drivers/mock/mock_driver.rb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a4a18cd8/server/lib/deltacloud/drivers/mock/mock_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/mock_driver.rb b/server/lib/deltacloud/drivers/mock/mock_driver.rb
index 0688ae6..5b76c47 100644
--- a/server/lib/deltacloud/drivers/mock/mock_driver.rb
+++ b/server/lib/deltacloud/drivers/mock/mock_driver.rb
@@ -145,7 +145,8 @@ module Deltacloud::Drivers::Mock
instance = instance(credentials, opts)
safely do
- raise 'CreateImageNotSupported' unless instance and instance.can_create_image?
+ raise 'NotFound' unless instance
+ raise 'CreateImageNotSupported' unless instance.can_create_image?
image = {
:id => opts[:name],
:name => opts[:name],
@@ -727,6 +728,10 @@ module Deltacloud::Drivers::Mock
message "Authentication Failure"
end
+ on /CreateImageNotSupported/ do
+ status 500
+ end
+
on /BucketNotEmpty/ do
status 403
message "Delete operation not valid for non-empty bucket"
@@ -745,14 +750,10 @@ module Deltacloud::Drivers::Mock
status 403
end
- on /(BucketNotExist || NotFound)/ do
+ on /(BucketNotExist|NotFound)/ do
status 404
end
- on /CreateImageNotSupported/ do
- status 500
- end
-
on /NotExistentBlob/ do
status 500
message "Could not delete a non existent blob"