Commit c9f2ebf8 authored by Jay's avatar Jay
Browse files

Updates for comments, moves test config and sample config into a config dir

parent 7330501e
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -56,11 +56,8 @@ install:
  - conda env update -n test -f environment.yml
  - export PROJ_LIB=$CONDA_PREFIX/share/proj  

  # Setup autocnet to connect to the db
  - export autocnet_config=sample.yml

script:
  - pytest -v autocnet
  - autocnet_config=config/test_config.yml pytest -v autocnet

after_success:
  - coveralls
+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ We suggest using Anaconda Python to install Autocnet within a virtual environmen
1. Install Docker
2. Get the Postgresql with Postgis container and run it `docker run --name testdb -e POSTGRES_PASSOWRD='' -e POSTGRES_USER='postgres' -p 5432:5432 -d mdillon/postgis`
3. create database template_postgis: `docker exec testdb psql -c 'create database template_postgis;' -U postgres`
4. Run the test suite.
4. Run the test suite: `autocnet_config=config/test_config.yml pytest autocnet`
+7 −7
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ cluster:
### Database Configuration ###
database:
    type: 'postgresql'
    username: 'postgres'
    password: ''
    host: 'localhost'
    port: 5432 # This is a mapped port when postgresql is containerized, e.g., 8085
    pgbouncer_port: 5432  # This is normally a different port, e.g., 8083
    username: 'sample'
    password: 'sample'
    host: 'smalls'
    port: 8085
    pgbouncer_port: 8083
    # The name of the database to connect to.  Tables will be created inside this DB.
    name: 'travis_ci_test' # This needs to be all lowercase for PostGreSQL!
    name: 'jelysiumtest' # This needs to be all lowercase for PostGreSQL!
    # The number of seconds to wait while attemping to connect to the DB.
    timeout: 500

@@ -41,7 +41,7 @@ redis:

### Spatial Reference Setup ###
spatial:
    srid: 4326  # 949900; this is a custom SRID for Mars. For testing we use WGS84.
    srid: 949900
    semimajor_rad: 3396190  # in meters
    semiminor_rad: 3376200  # in meters
    proj4_str: '+proj:longlat +a:3396190 +b:3376200 +no_defs'