You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/03/12 11:18:15 UTC

git commit: Core: Fixed namespacing of Firewall model in FGCP tests

Updated Branches:
  refs/heads/master 61c88b621 -> b177b1d77


Core: Fixed namespacing of Firewall model in FGCP tests


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/b177b1d7
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/b177b1d7
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/b177b1d7

Branch: refs/heads/master
Commit: b177b1d77b1728476aadf8f519a94195788bfca5
Parents: 61c88b6
Author: Michal Fojtik <mf...@redhat.com>
Authored: Tue Mar 12 11:17:45 2013 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Tue Mar 12 11:17:45 2013 +0100

----------------------------------------------------------------------
 .../collections/instances_collection_test.rb       |    2 --
 server/tests/drivers/fgcp/firewall_test.rb         |    6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b177b1d7/server/tests/deltacloud/collections/instances_collection_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/deltacloud/collections/instances_collection_test.rb b/server/tests/deltacloud/collections/instances_collection_test.rb
index 5b71d09..0cef4a7 100644
--- a/server/tests/deltacloud/collections/instances_collection_test.rb
+++ b/server/tests/deltacloud/collections/instances_collection_test.rb
@@ -37,8 +37,6 @@ describe Deltacloud::Collections::Instances do
     end
   end
 
-  require 'pry'
-
   it 'allow to create and execute actions on created instance' do
     post root_url + '/instances', { :image_id => 'img1', :name => 'test', }
     status.must_equal 201

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b177b1d7/server/tests/drivers/fgcp/firewall_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/fgcp/firewall_test.rb b/server/tests/drivers/fgcp/firewall_test.rb
index 20a6a14..ef44d28 100644
--- a/server/tests/drivers/fgcp/firewall_test.rb
+++ b/server/tests/drivers/fgcp/firewall_test.rb
@@ -23,7 +23,7 @@ describe 'FgcpDriver Firewalls' do
   it 'must return list of firewalls' do
     fws = @driver.firewalls
     fws.wont_be_empty
-    fws.each { |fw| fw.must_be_kind_of Firewall }
+    fws.each { |fw| fw.must_be_kind_of Deltacloud::Firewall }
     fws.each { |fw| fw.id.wont_be_nil }
   end
 
@@ -39,7 +39,7 @@ describe 'FgcpDriver Firewalls' do
   it 'must allow to retrieve single firewall' do
     fw = @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0001')
     fw.wont_be_nil
-    fw.must_be_kind_of Firewall
+    fw.must_be_kind_of Deltacloud::Firewall
     fw.id.must_equal 'UZXC0GRT-ZG8ZJCJ07-S-0001'
     @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0000').must_be_nil
   end
@@ -57,7 +57,7 @@ describe 'FgcpDriver Firewalls' do
     fw = @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0001')
     fw.wont_be_nil
     fw.rules.wont_be_empty
-    fw.rules.first.must_be_kind_of FirewallRule
+    fw.rules.first.must_be_kind_of Deltacloud::FirewallRule
     fw.rules.first.allow_protocol.wont_be_nil
     fw.rules.first.port_from.wont_be_nil
     fw.rules.first.port_to.wont_be_nil