Mercurial > p > roundup > code
changeset 6236:457a2eaa9848
merge another unintentional fork
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 26 Jul 2020 12:25:20 -0400 |
| parents | 88e0a54aa83c (current diff) c98159734735 (diff) |
| children | 0a37979bbd46 |
| files | |
| diffstat | 2 files changed, 23 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/.circleci/config.yml Fri Jul 24 15:45:17 2020 -0400 +++ b/.circleci/config.yml Sun Jul 26 12:25:20 2020 -0400 @@ -31,22 +31,23 @@ name: setup databases command: | psql -d postgresql://postgres@localhost/circle_test -c "CREATE ROLE rounduptest WITH CREATEDB LOGIN PASSWORD 'rounduptest';" - mysql -h 127.0.0.1 -u root -e "CREATE USER 'rounduptest'@'127.0.0.1' IDENTIFIED BY 'rounduptest'; GRANT ALL ON rounduptest.* TO 'rounduptest'@'127.0.0.1';" - # patch host to 127.0.0.1 to force TCP connection to MySQL - sed -i -e 's/\(config[.]RDBMS_HOST =\) "localhost"/\1 "127.0.0.1"/' test/db_test_base.py + echo -e "[client]\nprotocol=tcp\n" >~/.my.cnf + mysql --print-defaults + mysql -u root -e "CREATE USER 'rounduptest'@'127.0.0.1' IDENTIFIED BY 'rounduptest'; GRANT ALL ON rounduptest.* TO 'rounduptest'@'127.0.0.1';" - run: name: run tests command: | - py.test-3 -v test/ --cov=roundup - environment: - MYSQL_HOST: 127.0.0.1 + py.test-3 -v test/ --cov=roundup --junitxml test-results/ubuntu.xml - run: name: run coverage command: | python3-coverage html -i + - store_test_results: + path: test-results + - store_artifacts: path: htmlcov destination: roundup-ubuntu @@ -82,22 +83,23 @@ name: setup databases command: | psql -d postgresql://postgres@localhost/circle_test -c "CREATE ROLE rounduptest WITH CREATEDB LOGIN PASSWORD 'rounduptest';" - mysql -h 127.0.0.1 -u root -e "GRANT ALL ON rounduptest.* TO rounduptest@'127.0.0.1' IDENTIFIED BY \"rounduptest\";" - # patch host to 127.0.0.1 to force TCP connection to MySQL - sed -i -e 's/\(config[.]RDBMS_HOST =\) "localhost"/\1 "127.0.0.1"/' test/db_test_base.py + echo -e "[client]\nprotocol=tcp\n" >~/.my.cnf + mysql --print-defaults + mysql -u root -e "CREATE USER 'rounduptest'@'127.0.0.1' IDENTIFIED BY 'rounduptest'; GRANT ALL ON rounduptest.* TO 'rounduptest'@'127.0.0.1';" - run: name: run tests command: | - py.test-3 -v test/ --cov=roundup - environment: - MYSQL_HOST: 127.0.0.1 + py.test-3 -v test/ --cov=roundup --junitxml test-results/ubuntu-old.xml - run: name: run coverage command: | python3-coverage html -i + - store_test_results: + path: test-results + - store_artifacts: path: htmlcov destination: roundup-ubuntu-old @@ -133,22 +135,26 @@ name: setup databases command: | psql -d postgresql://postgres@localhost/circle_test -c "CREATE ROLE rounduptest WITH CREATEDB LOGIN PASSWORD 'rounduptest';" - mysql -h 127.0.0.1 -u root -e "GRANT ALL ON rounduptest.* TO rounduptest@'127.0.0.1' IDENTIFIED BY \"rounduptest\";" + echo -e "[client]\nprotocol=tcp\nhost=127.0.0.1\n" >~/.my.cnf + mysql --print-defaults + mysql -u root -e "CREATE USER 'rounduptest'@'127.0.0.1' IDENTIFIED BY 'rounduptest'; GRANT ALL ON rounduptest.* TO 'rounduptest'@'127.0.0.1';" # patch host to 127.0.0.1 to force TCP connection to MySQL sed -i -e 's/\(config[.]RDBMS_HOST =\) "localhost"/\1 "127.0.0.1"/' test/db_test_base.py + sed -i -e 's/rdbms_name=\([^,]\+\),/rdbms_host=127.0.0.1,rdbms_name=\1,/' test/test_admin.py - run: name: run tests command: | - py.test-3 -v test/ --cov=roundup - environment: - MYSQL_HOST: 127.0.0.1 + py.test-3 -v test/ --cov=roundup --junitxml test-results/debian.xml - run: name: run coverage command: | python3-coverage html -i + - store_test_results: + path: test-results + - store_artifacts: path: htmlcov destination: roundup-debian
--- a/website/README.txt Fri Jul 24 15:45:17 2020 -0400 +++ b/website/README.txt Sun Jul 26 12:25:20 2020 -0400 @@ -73,7 +73,7 @@ vim logbuch.txt If you get a "not trusting" error the problem is that the .hg files in -use are not owned by you and hg won;t use them. Add this to your +use are not owned by you and hg won't use them. Add this to your ~/.hgrc file (create file if needed) [trusted]