[PATCH] CIMI - removing testing address collection and whitespace cleanup

[rl...@redhat.com]

From: Ronelle Landy <rl...@redhat.com>

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

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
+
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
-- 
1.7.7.6