9 Commits

Author SHA1 Message Date
Martin Baeuml ad05875f0b Implement a more general version of the merge command
Also, add tests for this command.

This fixes #71.
2014-04-15 23:21:05 +02:00
Martin Baeuml d6a66eb0e6 remove empty file 2014-04-15 22:39:00 +02:00
Martin Baeuml 9b3ba3cb9f remove obsolete container tests 2014-03-19 22:35:50 +01:00
Martin Baeuml db1dc22036 cleanup/pep8 2014-03-19 22:35:42 +01:00
Martin Baeuml 638c3db45d pep8 changes 2014-03-19 14:15:06 +01:00
Martin Baeuml 87fd2f04a3 add test script for testing the annotationmodel with ModelTest 2011-06-17 14:27:46 +02:00
Martin Baeuml b6cb4d6bf3 add ModelTest 2011-06-17 14:27:46 +02:00
Martin Baeuml 807123918b add more container tests 2011-06-07 16:20:03 +02:00
Martin Baeuml a0e95c24bf move tests to own subdir, removes pytest runtime dependency 2011-05-24 22:09:44 +02:00