Commit Graph
446 Commits
Author SHA1 Message Date
Greg Von Kuster 6dc3ff8eb2 Enhance the process used by objects to retrieve tools from the tools_by_id dictionary. This allows for workflows that were built with tools originally included in the Galaxy distribution but later moved to the tool shed to function correctly if the tools are installed from the tool shed using Galaxy's update manager. In addition, workflows that were built using locally developed and hosted tools, but the tools were included in a tool shed repository, removed from the local instance, and then installed from the tool shed to function correctly. This approach works for the rerun button on history items as well. 2012-01-17 14:31:06 -05:00
Jeremy Goecks 2490f2e9c1 Update functional tests to be compatible with 0d1d62b8be2e 2012-01-17 09:05:11 -05:00
Nate Coraor 3c5c6ce091 Fix for some output changes I made to functional tests. 2011-12-08 10:14:29 -05:00
Nate Coraor 44344fe2e0 Fix the dataset controller's stderr method and add one for stdout. Link to
both from the dataset info page.  The functional tests will now provide output
of these on tool test failure.  The functional tests can now use
tool_dependency_dir as well.
2011-12-06 11:29:02 -05:00
Greg Von Kuster 041f54bcb1 Fix for data library functional test. 2011-12-06 08:56:21 -05:00
Greg Von Kuster 39d74e80b3 Fix some broken functional tests and fixes for deleting multiple data libraries and resetting the password for multiple users. Fixes issue # 678. 2011-12-05 09:58:36 -05:00
Daniel Blankenberg eefc21c030 Allow toolbox tests to test 0 instances of a repeat. 2011-10-20 10:03:28 -04:00
Nate Coraor 710401ce79 Abstraction for web methods, implemented for the Quota operations and the
framework is there for everything else now.  Works like this:

    * If your form/API params are the same across all forms for a model object
      (e.g. all Quota operations), they should be placed in mixins in
      galaxy.web.params and can be used universally by both the UI and API.

    * Validating params and performing the requestion actions go in mixins in
      galaxy.actions.  These return a value upon success or raise a
      MessageException upon failure.

    * Fetching objects with checks relevant to the web methods can be done via
      BaseController.get_object and its wrappers (see other helpers in the
      Mixins in galaxy.web.base.controller as well).

    * This leaves UI controller methods to just handle the stuff related to
      filling in web forms.

    * The API methods should be making use of paste.httpexceptions.* for
      handling error conditions.  Also, I think it'd be best to generally
      return an item's API value from most methods and include the "message" as
      an entry in the return dict rather than just by itself as a string.

None of this is required, but it would be great to convert the existing stuff
to this new model.

galaxy.exceptions is a collection point for all custom exceptions.

The User API now returns current disk usage with a User's detailed information.

Exceptions in the API are now logged by the expose_api decorator and hidden
from the client.
2011-09-22 17:13:53 -04:00
Nate Coraor cbb7111ea9 Bugfix for tool tests without attributes. 2011-09-02 10:16:07 -04:00
John Chilton 9ac9830a49 Small whitespace fix for bug introduced by last merge. 2011-08-31 11:31:23 -05:00
John Chilton eaeb4d7c20 Merged latest galaxy-central. 2011-08-31 11:08:30 -05:00
Ross Lazarus 5b2e7947ea Fixed sam_merge.xml to call Picard MergeSamFiles.jar so metadata can be propagated through to the new merged bam from all the individual files - the samtools version of merge would require this to be done separately and passed in with the -h option whereas Picard does it automatically. Added one more test. Interesting that the test for that tool has been failing to correctly pass metadata but passing the buildbot anyway. Thanks to Camille Stephan for pointing out the bug.
Changes to rgManQQ so the user can obtain a decent pdf image. When millions of points are plotted, these are humongous so GS is called to compress the resulting pdf and they are now of reasonable size. PDF's are now linked from the thumbnails. Some minor fiddling with point size on the Manhatten plots so the intersting ones are a little more obvious.

Minor tweak to twilltestcase.py so composite file components are copied correctly to the directory specified by GALAXY_TEST_SAVE. This makes updating test artefacts much simpler because running tests with GALAXY_TEST_SAVE pointing somewhere will now save every tested output file.
2011-08-04 12:43:30 +10:00
Greg Von Kuster d8279f0e5c Add an altered version of Jelle Scholtalbers' enhancement code to support uploding various image data types. I've moved some of the code components around from Jelle's version, and added some fixes. The cod ein the new image_util.py file enables detections of images types without the need to create a new Image() class.
I've also added baseline support of the HDF5 data type in this change set, but it is currently required to be in the unsniffable_data_types list.
2011-07-27 16:14:15 -04:00
Nate Coraor 0756941512 Move a number of dataset-related methods from the root controller to the dataset controller and encode their ids. Also add user disk usage accounting. 2011-07-26 13:30:07 -04:00
John Chilton 10129b8a17 Merged latest galaxy-central changes. 2011-07-25 13:13:17 -05:00
Kanwei Li 1abb36734a Escaping in tests should be more specific 2011-06-17 16:45:25 -04:00
John Chilton ce6aeb31c3 Enhancements to Galaxy's functional testing framework as outlined in issue 490. https://bitbucket.org/galaxy/galaxy-central/issue/490/enabling-iterative-test-driven-development 2011-05-17 15:29:02 -05:00
Daniel Blankenberg 3cbead3137 Add a "contains" compare type to functional tests. Enables simple checking for substrings in a test output file, on a line-by-line basis. TODO: Enhance to enforce order. 2011-05-10 20:11:52 -04:00
Daniel Blankenberg 7a1f15ab7e Fix for expand grouping to allow toolbox tests to use the default parameter value. 2011-05-10 19:59:46 -04:00
Kelly Vincent d6deb67bf2 Added -h flag to samtools view command in functional test's bam to sam conversion so that it keeps the header 2011-04-22 14:58:44 -04:00
Ross Lazarus ee6bd2cf46 Changes to allow all test outputs generated by twill to be saved to a folder pointed to by
an environment variable "GALAXY_TEST_SAVE" if defined before running functional tests
If the environment variable is empty, all tests procede as usual and test outputs are deleted
without saving
2011-04-14 08:09:48 -04:00
Greg Von Kuster 8ba7de4c8b Improved checking to determine if a bam file is sorted. If the version of samtools being used is 0.1.13 or newer, determination of bam sorting is now much more robust. Add a new functional test to the test_library_features script that tests uploading a library_dataset (where the file is an unsorted bam file) using a combination of 'upload_paths' and 'link_to_files'. Rename the test-data file previously named 3.bam to now be named 3unsorted.bam to clarify that it is an unsorted bam file. 2011-03-23 12:18:57 -04:00
Daniel Blankenberg b5131d44ce Disable functional test for not being able to import your own history which was enabled in 5248:dc9efb540f61. 2011-03-23 08:42:01 -04:00
Greg Von Kuster e83efed183 Fixes in the user controller:
1. Eliminate some long-standing security issues
2. Encode all object ids - many were not being encoded
3. Eliminate all unnecessary methods
4. Rewite several poorly written methods
5. Fix several bugs related to USER_INFO form definitions
2011-03-22 10:33:42 -04:00
Daniel Blankenberg c52ba62119 When using re_match comparison method in functional tests and line counts do not match, print out first 40 lines of the history file. 2011-03-16 22:27:15 -04:00
Greg Von Kuster 7640af8e06 Don't alter the contents of a file while uploading to a data library if using the filesystem_paths option. This partially resolves the issue where a supposedly sorted BAM file was being resorted upon upload to a data library when using this option. A better imlementation of determining whether a BAM file has been sorted (so that it does not get resorted) remains to be done. 2011-03-15 09:38:29 -04:00
Greg Von Kuster df6f94b1d0 Per request from Peter Cock, turn the "Copy data into Galaxy?" check box into a select list that clarifies the behavior. The default is to copy files into Galaxy. 2011-03-11 14:56:11 -05:00
Greg Von Kuster c650958915 Apply a corrected version of the patch from Peter Cock that flips the  "Preserve directory structure?" setting when uploading library datasets from filesystem paths. 2011-03-11 10:01:54 -05:00
Greg Von Kuster 0e79bf2632 Add a checkbox to the Create Group page that if checked will create a new Role with the same name. This provides a similar feature the the existing checkbox on the Create Role page.
However, the behavior is now changed such that new associations are created when the checkbox is checked whereas before, only the Group or Role objects with the same name were created, but not associated with anything.

This code was very old, so I did some cleanup / improvements as well.  Functional tests enhanced to reflect changes.
2011-03-10 15:48:00 -05:00
Greg Von Kuster a5ea34e29a Add functional tests to cover some recent new library features, and a couple of miscellaneous UI improvements. 2011-03-09 14:50:54 -05:00
Nate Coraor a221548e8f An uninitialized value in R's PDF driver was causing it to sometimes randomly add a few elements to PDF outputs. The bug has been fixed in the buildbot environment and these changes account for that fix. 2011-03-08 11:17:57 -05:00
Nate Coraor 19236474c4 Cause lines_diff on pdf test outputs to only count the lines of a pdf which are not already ignored. 2011-03-03 12:21:22 -05:00
Daniel Blankenberg 4eb1b0a79f Better determination in tests if a provided input is a DataToolParameter to better handle .gz and .zip uploads and allowing uploads from a sub-directory of test-data/. 2011-02-28 12:16:28 -05:00
Nate Coraor e1ea63eb9a When comparing bam files in the test framework, convert them to sam for comparison. 2011-02-23 14:53:54 -05:00
Kanwei Li 4660370320 Copy datasets feature:
- Fix functional tests
- Populate previously selected target history if attempt fails
2011-02-22 17:14:16 -05:00
Daniel Blankenberg 3854d341ad Allow toolbox tests to upload a file found located in subdirectories. Fix a bug occurring on the determination of uploaded dataset name during the handling of the removal of .gzip or .zip extension from the uploaded filenames within the toolbox test framework. 2011-02-22 16:56:11 -05:00
Guruprasad Anada ff7e8fe2e0 Fixed functional tests for the following tools: histogram, estimate indel rates, compute q-values, kernel pca. 2011-02-22 12:37:06 -05:00
Nate Coraor 7a87e6c6db Fix for 3 of the 4 failing upload tests. 2011-02-18 16:21:11 -05:00
Greg Von Kuster 023880b713 Data library fixes and improvements:
1. Fix a bug that included the option for a regular user to upload a directory of files when the config setting existed, but the user's directory did not exist.  Instead of throwing an exception, an attempt to create the directory will now be done.  If the attempt fails, the option to "Upload a directory of files" will not be included in the select list on the upload form.

2. When browsing a data library, only display the check boxes and the actions to perform on multiple selected datasets if library datasets are displayed.

3. Clean up the behavior when performing an action on multiple library datasets.  Instead of throwing an error and not allowing the action on any of the datasets if the user is not authorized to perform the action on 1 of them, all "unauthorized" datasets are now left alone and the action is performed on all datasets for which the user is authorized to perform the action.  Appropriate messages detail what occurred.

4. Allow regular users to delete multiple datasets returned from library dataset searches based on the behavior described in 3 above.

5. Do not include the "Select datasets for import into selected histories" option in the actions pop-up menu at the data library level if the library's root folder doesn't contain any accessible datasets.  Make behavior the same for folder popup menus.

6.  Add a new LibraryFolder.active_datasets mapper and eliminate the incorrect LibraryFolder.active_library_datasets property.  Callers of the incorrect property now use the mapper.

7. Eliminate the incorrect LibraryFolder.active_datasets property.

8. Fix the queries in the library_common controller's active_folders_and_lddas() and activable_folders_and_lddas() methods to return library_datasets instead of lddas, and rename the methods to be active_folders_and_library_datasets(0 and activatable_folders_and_library_datasets() respectively.

9. Fix bug where regular user could never see deleted library items when toggling show / hide deleted items.

10. Fix functional test for uploading directories of files to a library folder.  The test generally failed because not enough time would elapse before checking if the files uploaded.  The check is now performed in a later method in the test script, hopefully allowing for enough time to pass.

11. Functional test code clarifications for the browse_library() test method.
2011-02-04 16:16:00 -05:00
Greg Von Kuster e8e6753c47 Apply patch from Brad Chapman that fixes an issue when downloading a zip archive of library datasets. Also include some miscellansous imporvements and code cleanup related to changes made in change set 4964:82107691d26e. 2011-02-01 11:21:41 -05:00
Greg Von Kuster 5f9f45a068 Several data library improvements:
1. Enhance importing library dataset into the current history by now allowing the user to select from a list of existing histories or create a new named history ( similar to copying datasets ).  This feature is available for a specific library dataset, a folder ( or root folder ), when selecting multiple datasets from in a library,  and on the results page for searched library datasets.

2. Add Brad Chapman's latest patch for fixing the lucene search implementation

3. Eliminate searches on dataset state for both whoosh and lucene searches

4. Clarify the objects being searched in the regular search and advanced search boxes in the data libraries grids.

5. Add the ability to perform certain actions on 1 or more selected library datasets on the results page for searched library datasets.

6. Add a "select all" checkbox to the browse_library.mako template.

7. Fixed library functional tests accordingly.
2011-01-31 16:41:03 -05:00
Ramkrishna Chakrabarty 7e3387aabd Request type now requires at least one sample state
Added validation checks for request types with only one sample state
Bug fixes
2011-01-28 10:24:55 -05:00
Ramkrishna Chakrabarty 529098e77e Added ability to add samples after a request is submitted. 2011-01-26 11:35:52 -05:00
Greg Von Kuster af55a392fc Fix for rendering folders select field for a sample - include hte library's root folder in the select field too. Fix for setting the default name of the sample grid layout. Fix sample tracking functional test script. 2011-01-12 16:15:40 -05:00
Ramkrishna Chakrabarty 77c6f3ea06 FIxed the unwanted changes made in the previous commit 2011-01-07 16:19:59 -05:00
Ramkrishna Chakrabarty f7a35e13cb Renamed sequencer to external_service and sequencer_type to external_service_type.
Added table to associate external services to a request type.
Enhanced UI to support selection of multiple external services for a request type.
2011-01-07 16:12:36 -05:00
Ramkrishna Chakrabarty b72c2406c8 Fixed user_info and sample_tracking functional tests.
Refactored getting form values into a separate method in controller.py.
Changed request type access into a restrict permission.
Added a check when sequencer_types are not loaded.
2011-01-04 07:11:12 -05:00
Greg Von Kuster 5e2d7e83f1 Eliminate the use of the 'editing_samples' flag by adding the code needed to add new samples without calling the edit_samples method or mako template. Decoupling the different features makes them much cleaner and easier to maintain. 2011-01-03 11:11:00 -05:00
Ramkrishna Chakrabarty 7858868650 First pass of the new sequencer_type & sequencer framework
- sequencer table now populated with the unique sequencer in the request_type table
- sequencer_type is introduced which defines a sequencer
- support for sequencer (create, delete, edit)
- added support for a simple sequencer for backward compatibility
- added support for Solid sequencer
- tweaked the request_type api methods. removed the sequencer login info.
2010-12-20 10:50:50 -05:00
Greg Von Kuster 11957ed5fa Fixed as many of the issues as could be found throughout the framework due to the migration of FormValues.content from a list to a dictionary in change set 4744 b73ad3906e24. 2010-12-15 17:00:29 -05:00