From 336aa4c31a6d5e53c56badee59dfec9267071516 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 25 Jul 2014 11:51:11 -0500 Subject: [PATCH] Fix API tests for 879c485... Which made tool multirun link/match instead cross producting (will someday figure a terminology for this :)). --- test/api/test_tools.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/api/test_tools.py b/test/api/test_tools.py index f3a413d20a4..419ddfe073b 100644 --- a/test/api/test_tools.py +++ b/test/api/test_tools.py @@ -189,13 +189,16 @@ class ToolsTestCase( api.ApiTestCase ): ], } outputs = self._cat1_outputs( history_id, inputs=inputs ) - self.assertEquals( len( outputs ), 4 ) + self.assertEquals( len( outputs ), 2 ) self.dataset_populator.wait_for_history( history_id, assert_ok=True ) outputs_contents = [ self._get_content( history_id, dataset=o ).strip() for o in outputs ] assert "123\n789" in outputs_contents - assert "456\n789" in outputs_contents - assert "123\n0ab" in outputs_contents assert "456\n0ab" in outputs_contents + # TODO: Once cross production (instead of linking inputs) is an option + # again redo test with these checks... + # self.assertEquals( len( outputs ), 4 ) + # assert "123\n0ab" in outputs_contents + # assert "456\n789" in outputs_contents @skip_without_tool( "cat1" ) def test_map_over_collection( self ):