diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-11-25 12:39:33 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-11-25 12:39:33 -0300 |
| commit | 194f4d896e2ada660fe082c7f486279723fdb1b0 (patch) | |
| tree | 6e4a46f56e499e79568843ae302528f5c9ac5d66 /common | |
| parent | d2f161e3efda601bccfc390392302f665f8a644b (diff) | |
| parent | 61fe6b1ed3f8a42eb22e12168c88212e55b9095e (diff) | |
Merge remote-tracking branch 'drebs/bug/4258_remove-dependency-on-nose2' into develop
Diffstat (limited to 'common')
| -rw-r--r-- | common/changes/bug_4258_remove-dependency-on-nose2 | 1 | ||||
| -rw-r--r-- | common/pkg/requirements-testing.pip | 5 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/tests/u1db_tests/README | 8 |
3 files changed, 1 insertions, 13 deletions
diff --git a/common/changes/bug_4258_remove-dependency-on-nose2 b/common/changes/bug_4258_remove-dependency-on-nose2 new file mode 100644 index 00000000..d83fc49c --- /dev/null +++ b/common/changes/bug_4258_remove-dependency-on-nose2 @@ -0,0 +1 @@ + o Remove tests dependency on nose2. Closes #4258. diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip index 6ff52ff9..9302450c 100644 --- a/common/pkg/requirements-testing.pip +++ b/common/pkg/requirements-testing.pip @@ -1,10 +1,5 @@ mock -nose2 testscenarios leap.common leap.soledad.server leap.soledad.client - -# Under quarantine... -# I've been able to run all tests with six==1.3 -- kali -# six==1.1.0 # some tests are incompatible with newer versions of six. diff --git a/common/src/leap/soledad/common/tests/u1db_tests/README b/common/src/leap/soledad/common/tests/u1db_tests/README index 605f01fa..d543f250 100644 --- a/common/src/leap/soledad/common/tests/u1db_tests/README +++ b/common/src/leap/soledad/common/tests/u1db_tests/README @@ -12,7 +12,6 @@ Dependencies u1db tests depend on the following python packages: - nose2 unittest2 mercurial hgtools @@ -25,10 +24,3 @@ u1db tests depend on the following python packages: routes simplejson cython - -Running tests -------------- - -Use nose2 to run tests: - - nose2 leap.soledad.tests.u1db_tests |