From 9da400a5ddaae7dd9d426500d5881f4035fdb6d1 Mon Sep 17 00:00:00 2001
From: msauria <crockopotamus@gmail.com>
Date: Fri, 17 May 2019 10:02:43 -0400
Subject: [PATCH] Removed testing using 'containsh5keys' attribute

---
 lib/galaxy/tools/xsd/galaxy.xsd           | 14 +-------------
 test/functional/tools/validation_hdf5.xml |  3 +--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/galaxy/tools/xsd/galaxy.xsd b/lib/galaxy/tools/xsd/galaxy.xsd
index d1c007c9bad..5768a74a8ca 100644
--- a/lib/galaxy/tools/xsd/galaxy.xsd
+++ b/lib/galaxy/tools/xsd/galaxy.xsd
@@ -1652,8 +1652,6 @@ module.
       </xs:element>
       <xs:element name="has_h5_keys" type="AssertHasH5Keys">
       </xs:element>
-      <xs:element name="contains_h5_keys" type="AssertContainsH5Keys">
-      </xs:element>
       <xs:element name="has_h5_attribute" type="AssertHasH5Attribute">
       </xs:element>
       <xs:element name="has_archive_member" type="AssertHasArchiveMember">
@@ -1662,17 +1660,7 @@ module.
   </xs:group>
   <xs:complexType name="AssertHasH5Keys">
     <xs:annotation>
-      <xs:documentation xml:lang="en"><![CDATA[Asserts HDF5 output has a set of attributes (``keys``), specified as a comma-separated list (e.g. ``<has_h5_keys keys="bins,chroms,indexes,pixels" />``).]]></xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="keys" type="xs:string">
-      <xs:annotation>
-        <xs:documentation xml:lang="en">Comma-separated list of HDF5 attributes to check for.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="AssertContainsH5Keys">
-    <xs:annotation>
-      <xs:documentation xml:lang="en"><![CDATA[Asserts HDF5 output includes a set of attributes (``keys``) including nested attributes, specified as a comma-separated list (e.g. ``<contains_h5_keys keys="bins,resolution/chroms,indexes,pixels" />``).]]></xs:documentation>
+      <xs:documentation xml:lang="en"><![CDATA[Asserts HDF5 output has a set of attributes (``keys``), specified as a comma-separated list (e.g. ``<has_h5_keys keys="bins,chroms,indexes,pixels,chroms/lengths" />``).]]></xs:documentation>
     </xs:annotation>
     <xs:attribute name="keys" type="xs:string">
       <xs:annotation>
diff --git a/test/functional/tools/validation_hdf5.xml b/test/functional/tools/validation_hdf5.xml
index 810c1f0092f..d3cd9f9175b 100644
--- a/test/functional/tools/validation_hdf5.xml
+++ b/test/functional/tools/validation_hdf5.xml
@@ -13,8 +13,7 @@
             <param name="input" value="matrix.cool" />
             <output name="output">
                 <assert_contents>
-                    <has_h5_keys keys="bins, chroms,indexes,pixels" />
-                    <contains_h5_keys keys="bins,chroms/length,chroms,name" />
+                    <has_h5_keys keys="bins, chroms,indexes,pixels,chroms/length" />
                     <has_h5_attribute key="nbins" value="33754" />
                     <has_h5_attribute key="nchroms" value="15" />
                 </assert_contents>