From 8d1b6a8c74e32290f8cd4e6543f5d473e5070e05 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 14 Mar 2014 10:12:41 -0500
Subject: [PATCH] Check ftype attribute (if defined) on test output datasets.

Only works for newer API driven tests.
---
 test/base/interactor.py            | 13 ++++++++++---
 test/functional/tools/metadata.xml |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/base/interactor.py b/test/base/interactor.py
index b0e062940bb..1f1761eacc1 100644
--- a/test/base/interactor.py
+++ b/test/base/interactor.py
@@ -45,13 +45,20 @@ class GalaxyInteractorApi( object ):
         fetcher = self.__dataset_fetcher( history_id )
         ## TODO: Twill version verifys dataset is 'ok' in here.
         self.twill_test_case.verify_hid( outfile, hda_id=hid, attributes=attributes, dataset_fetcher=fetcher, shed_tool_id=shed_tool_id )
-        metadata = attributes.get( 'metadata', {} )
+        metadata = attributes.get( 'metadata', {} ).copy()
+        for key, value in metadata.copy().iteritems():
+            new_key = "metadata_%s" % key
+            metadata[ new_key ] = metadata[ key ] 
+            del metadata[ key ]
+        expected_file_type = attributes.get( 'ftype', None )
+        if expected_file_type:
+            metadata[ "file_ext" ] = expected_file_type
+
         if metadata:
             dataset = self._get( "histories/%s/contents/%s" % ( history_id, hid ) ).json()
             for key, value in metadata.iteritems():
-                dataset_key = "metadata_%s" % key
                 try:
-                    dataset_value = dataset.get( dataset_key, None )
+                    dataset_value = dataset.get( key, None )
                     if dataset_value != value:
                         msg = "Dataset metadata verification for [%s] failed, expected [%s] but found [%s]."
                         msg_params = ( key, value, dataset_value )
diff --git a/test/functional/tools/metadata.xml b/test/functional/tools/metadata.xml
index 044557c560a..cc68946ec0d 100644
--- a/test/functional/tools/metadata.xml
+++ b/test/functional/tools/metadata.xml
@@ -16,7 +16,7 @@
         <metadata name="base_name" value="Example Metadata" />
       </param>
       <!-- This ouptut tests setting input metadata above -->
-      <output name="output_of_input_metadata">
+      <output name="output_of_input_metadata" ftype="txt">
         <assert_contents>
           <has_line line="Example Metadata" />
         </assert_contents>