Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:okfn/ckan into 1253-moving-user-g…
…uides Conflicts: doc/datastore.rst doc/deployment.rst
- Loading branch information
Showing
198 changed files
with
6,867 additions
and
5,402 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[run] | ||
omit = /ckan/migration/*, /ckan/tests/*, */tests/* | ||
source = ckan, ckanext |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
#!/bin/sh | ||
|
||
# Configure Solr | ||
echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty | ||
# FIXME the solr schema cannot be hardcoded as it is dependent on the ckan version | ||
sudo cp ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml | ||
sudo service jetty restart | ||
|
||
# Run mocha front-end tests | ||
# We need ckan to be running for some tests | ||
paster serve test-core.ini & | ||
sleep 5 # Make sure the server has fully started | ||
mocha-phantomjs http://localhost:5000/base/test/index.html | ||
# Did an error occur? | ||
MOCHA_ERROR=$? | ||
# We are done so kill ckan | ||
killall paster | ||
|
||
# And finally, run the nosetests | ||
nosetests --ckan --reset-db --with-pylons=test-core.ini --nologcapture ckan ckanext | ||
# Did an error occur? | ||
NOSE_ERROR=$? | ||
|
||
[ "0" -ne "$MOCHA_ERROR" ] && echo MOCKA tests have failed | ||
[ "0" -ne "$NOSE_ERROR" ] && echo NOSE tests have failed | ||
|
||
# If an error occurred in our tests make sure travis knows | ||
exit `expr $MOCHA_ERROR + $NOSE_ERROR` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.