deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [26/31] git commit: Reformat to use 2 space indent like the rest of the code base
Date Wed, 25 Jul 2012 13:56:38 GMT
Reformat to use 2 space indent like the rest of the code base


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

Branch: refs/heads/master
Commit: 45cd41e9c4b9369411a84e25f61a7a88fca8bacd
Parents: d671050
Author: David Lutterkort <lutter@redhat.com>
Authored: Fri Jul 20 15:01:43 2012 -0700
Committer: marios <marios@redhat.com>
Committed: Tue Jul 24 12:01:36 2012 +0300

----------------------------------------------------------------------
 tests/Rakefile                   |   10 +++++-----
 tests/deltacloud/buckets_test.rb |   10 +++++-----
 tests/deltacloud/test_setup.rb   |   30 +++++++++++++++---------------
 3 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/45cd41e9/tests/Rakefile
----------------------------------------------------------------------
diff --git a/tests/Rakefile b/tests/Rakefile
index b9caa72..a378ffc 100644
--- a/tests/Rakefile
+++ b/tests/Rakefile
@@ -19,10 +19,10 @@ require 'deltacloud/test_setup.rb'
 
 namespace :test do
 
-    file_list = Rake::FileList.new(deltacloud_test_file_names)
-    Rake::TestTask.new(:deltacloud) do |t|
-      t.test_files = file_list << "deltacloud/base_api_test.rb"
-      t.options = "-v"
-    end
+  file_list = Rake::FileList.new(deltacloud_test_file_names)
+  Rake::TestTask.new(:deltacloud) do |t|
+    t.test_files = file_list << "deltacloud/base_api_test.rb"
+    t.options = "-v"
+  end
 
 end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/45cd41e9/tests/deltacloud/buckets_test.rb
----------------------------------------------------------------------
diff --git a/tests/deltacloud/buckets_test.rb b/tests/deltacloud/buckets_test.rb
index 73aeeb3..2f7406b 100644
--- a/tests/deltacloud/buckets_test.rb
+++ b/tests/deltacloud/buckets_test.rb
@@ -28,10 +28,10 @@ features_hash = discover_features
 
 describe 'Deltacloud API buckets collection' do
 
-MiniTest::Unit.after_tests{
-  #finally delete the bucket/blob we created for the tests:
-  delete_bucket_and_blob(bucket, blob)
-}
+  MiniTest::Unit.after_tests{
+    #finally delete the bucket/blob we created for the tests:
+    delete_bucket_and_blob(bucket, blob)
+  }
 
   it 'must advertise the buckets collection in API entrypoint' do
     res = xml_response(get)
@@ -68,7 +68,7 @@ MiniTest::Unit.after_tests{
   it 'should be possible to specify location for POST /api/buckets if bucket_location feature'
do
     skip("No bucket_location feature specified for driver #{API_DRIVER} running at #{API_URL}...
skipping test") unless features_hash["buckets"].include?("bucket_location")
     bucket_name = random_name
-#    res = post({:name=>bucket_name, :bucket_location=>
+    #    res = post({:name=>bucket_name, :bucket_location=>
   end
 
 

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/45cd41e9/tests/deltacloud/test_setup.rb
----------------------------------------------------------------------
diff --git a/tests/deltacloud/test_setup.rb b/tests/deltacloud/test_setup.rb
index d815ee3..14f6d8d 100644
--- a/tests/deltacloud/test_setup.rb
+++ b/tests/deltacloud/test_setup.rb
@@ -79,18 +79,18 @@ end
 #the TEST_FILES hash and deltacloud_test_file_names method
 #which follows is used in the Rakefile for the rake test:deltacloud task
 TEST_FILES =  { :images             => "images_test.rb",
-                :realms             => "realms_test.rb",
-                :hardware_profiles  => "hardware_profiles_test.rb",
-                :instance_states    => "instance_states_test.rb",
-                :instances          => "instances_test.rb",
-                :keys               => "keys_test.rb",
-                :firewalls          => "firewalls_test.rb",
-                :addresses          => "addresses_test.rb",
-                :load_balancers     => "load_balancers_test.rb",
-                :storage_volumes    => "storage_volumes_test.rb",
-                :storage_snapshots  => "storage_snapshots_test.rb",
-                :buckets            => "buckets_test.rb"
-              }
+  :realms             => "realms_test.rb",
+  :hardware_profiles  => "hardware_profiles_test.rb",
+  :instance_states    => "instance_states_test.rb",
+  :instances          => "instances_test.rb",
+  :keys               => "keys_test.rb",
+  :firewalls          => "firewalls_test.rb",
+  :addresses          => "addresses_test.rb",
+  :load_balancers     => "load_balancers_test.rb",
+  :storage_volumes    => "storage_volumes_test.rb",
+  :storage_snapshots  => "storage_snapshots_test.rb",
+  :buckets            => "buckets_test.rb"
+}
 #gets the list of collections from the server running at API_URL and translates those into
file names accoring to TEST_FILES
 def deltacloud_test_file_names
   driver_collections = xml_response(RestClient.get API_URL, {:accept=>:xml}).xpath("//api/link").inject([]){|res,
current| res<<current[:rel].to_sym ;res}
@@ -102,7 +102,7 @@ def create_a_bucket_and_blob
   bucket_name = random_name
   blob_name = random_name
   #create bucket:
-#  res = RestClient.post "#{API_URL}/buckets", {:name=>bucket_name}, {:Authorization=>BASIC_AUTH}
+  #  res = RestClient.post "#{API_URL}/buckets", {:name=>bucket_name}, {:Authorization=>BASIC_AUTH}
   res = post({:name=>bucket_name}, "/buckets", {}, true)
   raise Exception.new("unable to create bucket with name #{bucket_name} for bucket_test.rb")
unless res.code == 201
   #create blob:
@@ -117,10 +117,10 @@ def random_name
 end
 
 def delete_bucket_and_blob(bucket, blob)
-#  res = RestClient.delete "#{API_URL}/buckets/#{bucket}/#{blob}", {:Authorization=>BASIC_AUTH}
+  #  res = RestClient.delete "#{API_URL}/buckets/#{bucket}/#{blob}", {:Authorization=>BASIC_AUTH}
   res = delete({}, "/buckets/#{bucket}/#{blob}")
   raise Exception.new("unable to delete blob with name #{blob} for bucket_test.rb") unless
res.code == 204
-#  res = RestClient.delete "#{API_URL}/buckets/#{bucket}", {:Authorization=>BASIC_AUTH}
+  #  res = RestClient.delete "#{API_URL}/buckets/#{bucket}", {:Authorization=>BASIC_AUTH}
   res = delete({}, "/buckets/#{bucket}")
   raise Exception.new("unable to delete bucket with name #{bucket} for bucket_test.rb") unless
res.code == 204
 end


Mime
View raw message