jenkins-bot has submitted this change and it was merged.

Change subject: Use setup.py nosetests
......................................................................


Use setup.py nosetests

Dependencies are automatically managed by setup.py

Change-Id: I5c7d77e77adfdfcaa2258878bce8b49df0f46728
---
M .travis.yml
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  XZise: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.travis.yml b/.travis.yml
index 414475a..fc2a251 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@
 
 install:
   - if [[ "$SITE_ONLY" == '1' ]]; then export USE_NOSE=1; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install ordereddict 
unittest2==0.6.0; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install 
unittest2==0.6.0; fi
   - pip install six
   - export GITHUB_USER=`echo $TRAVIS_REPO_SLUG | cut -d '/' -f 1`
   - mkdir ~/.pywikibot
@@ -51,9 +51,9 @@
   - if [[ "$USE_NOSE" == "1" ]]; then
       if [[ "$SITE_ONLY" == "1" ]]; then
         echo "Running site tests only code ${LANGUAGE} on family ${FAMILY}" ;
-        nosetests tests -v -a "family=$FAMILY,code=$LANGUAGE" ;
+        python setup.py nosetests --tests tests -v -a 
"family=$FAMILY,code=$LANGUAGE" ;
       else
-        nosetests tests -v ;
+        python setup.py nosetests --tests tests -v ;
       fi ;
     else
       python setup.py test ;

-- 
To view, visit https://gerrit.wikimedia.org/r/186215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c7d77e77adfdfcaa2258878bce8b49df0f46728
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to