Merge pull request #344 from jtharris/bugs/BZ928357

Fixes for rhc_extended tests
openshift · Mar 28, 2013 · 0c82e2e · 0c82e2e
2 parents 7307f1e + 7dea458
commit 0c82e2e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/features/lib/rhc_helper/persistable.rb b/features/lib/rhc_helper/persistable.rb
@@ -31,7 +31,10 @@ def from_json(json)
       app.mysql_password = json['mysql_password']
       app.mysql_hostname = json['mysql_hostname']
       app.uid = json['uid']
-      return app
+      # Strip off any version info for the type
+      app.type = app.type.split('-').first
+
+      app
     end
   end
 

diff --git a/features/multiple_cartridge.feature b/features/multiple_cartridge.feature
@@ -8,11 +8,12 @@ Feature: Multiple Cartridge Tests
     Then the phpmyadmin cartridge should be running
 
   @not-origin
-  Scenario: Conflicting Cartridge Fails
-    Then adding the postgresql cartridge should fail
+  Scenario: Multiple DBs Allowed
+    When the postgresql cartridge is added
+    Then the postgresql cartridge should be running
 
   Scenario: Cartridge Removed
     When the phpmyadmin cartridge is removed
     When the mysql cartridge is removed
     Then the phpmyadmin cartridge should be removed
-    Then the mysql cartridge should be removed
+    Then the mysql cartridge should be removed