deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject git commit: CIMI - removing testing address collection and whitespace cleanup
Date Mon, 03 Dec 2012 18:04:20 GMT
Updated Branches:
  refs/heads/master c70d86238 -> 1d95d5a8b


CIMI - removing testing address collection and whitespace cleanup

TrackedAt: http://tracker.deltacloud.org/patch/1bd7f54f964c326cde80da77cf57766488fceda9


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

Branch: refs/heads/master
Commit: 1d95d5a8b672a16b34d2387abddb40c5125fe1c5
Parents: c70d862
Author: Ronelle Landy <rlandy@redhat.com>
Authored: Mon Dec 3 12:28:51 2012 -0500
Committer: marios <marios@redhat.com>
Committed: Mon Dec 3 20:00:13 2012 +0200

----------------------------------------------------------------------
 tests/cimi/cep_test.rb   |    5 ++++-
 tests/cimi/part3_test.rb |    6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1d95d5a8/tests/cimi/cep_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/cep_test.rb b/tests/cimi/cep_test.rb
index 7504667..cc488a3 100644
--- a/tests/cimi/cep_test.rb
+++ b/tests/cimi/cep_test.rb
@@ -26,7 +26,9 @@ class CloundEntryPointBehavior < CIMI::Test::Spec
             "volumes", "volumeTemplates", "volumeConfigs", "volumeImages",
             "networks", "networkTemplates", "networkConfigs", "networkPorts",
             "networkPortTemplates", "networkPortConfigs",
-            "addresses", "addressTemplates", "forwardingGroups",
+# FIXME: accessing this collection errors
+#            "addresses",
+            "addressTemplates", "forwardingGroups",
 # FIXME: accessing this collection causes the thin process to take
 #        all available memory
 #            "forwardingGroupTemplates",
@@ -89,3 +91,4 @@ class CloundEntryPointBehavior < CIMI::Test::Spec
   end
 
 end
+

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1d95d5a8/tests/cimi/part3_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/part3_test.rb b/tests/cimi/part3_test.rb
index 8915727..d7bb45b 100644
--- a/tests/cimi/part3_test.rb
+++ b/tests/cimi/part3_test.rb
@@ -23,18 +23,19 @@ class CreateNewMachineFromMachineTemplate < CIMI::Test::Spec
     "http://schemas.dmtf.org/cimi/1/CloudEntryPoint"
   ROOTS = ["machines", "machineImages", "machineConfigurations"]
 
+  MiniTest::Unit.after_tests { teardown(@@created_resources, api.basic_auth) }
+
   #  Ensure test executes in test plan order
   i_suck_and_my_tests_are_order_dependent!
 
   model :subject, :cache => true do |fmt|
     cep(:accept => fmt)
   end
+
   # This test must adhere to one of the "Query the CEP" test in the previous section.
   # CEP.machines, CEP.machineConfigs and CEP.machineImages must be set
   query_the_cep(ROOTS)
 
-  i_suck_and_my_tests_are_order_dependent!
-  MiniTest::Unit.after_tests { teardown(@@created_resources, api.basic_auth) }
   #create a machineTemplate for use in these tests:
   cep_json = cep(:accept => :json)
   mach_templ_add_uri = discover_uri_for("add", "machineTemplates")
@@ -59,7 +60,6 @@ class CreateNewMachineFromMachineTemplate < CIMI::Test::Spec
   # CEP.machines, CEP.machineConfigs and CEP.machineImages must be set
   query_the_cep(ROOTS)
 
-
   # 3.2 Querying MachineTemplates
   # At least one MachineTemplate resource must appear in the collection
   it "should contain one MachineTemplates resource" do


Mime
View raw message