Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Creating TestNominatim.py #929

Merged
merged 94 commits into from
Nov 1, 2023
Merged

Commits on Jul 21, 2023

  1. Creating TestNominatim.py

    Creating an integration test to make sure nominatim calls work properly. The tests call various classes from Nominatim.py and ensures that the format of the responses are as expected with the current calling format.
    nataliejschultz committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    ceaddc7 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Multiple changes for nominatim testing

    save_ground_truth.py: added parser argument line so that ground truth can be saved successfully using "diary" argument.
    
    Generated a ground truth file while testing save_ground_truth.py.
    
    Modified nominatim.py to remove all google based functionality.
    
    Created new docker-compose.yml, Dockerfile, and a few shell scripts in emission/integrationTests to run the integration tests while starting Nominatim server through docker container.
    
    nominatim-docker-test.yml sets up the servers in GH actions and runs docker-compose.
    
    runIntegrationTests.sh uses the discover method to run all tests in emission/integrationTests.
    
    TestNominatimBeta.py compares the result of a reverse geocoding call to nominatim with an expected output.
    removed ports from docker-compose.tests.yml per Shankari's instruction.
    nataliejschultz committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    dbce159 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Cleaning up the PR to try out nominatim test.

    Moved nominatim-docker-test.yml to github workflows directory and set path to docker compose.
    
    Edited docker-compose.yml to reflect rhode island data instead of norcal; updated ports.
    
    Added environment variable to dockerfile (not quite polished yet) so that nominatim query can be run with localhost when appropriate.
    nataliejschultz committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    067158c View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Top of workflow edits

    Trying to get nominatim-docker-test.yml to run in GH actions with small syntax changes. Also changing the repo from which docker builds to current directory.
    nataliejschultz committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    b7e77fb View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. TestNominiatm Changes

    Removed unused imports.
    
    Added a line that temporarily sets the query URL in eco to that of the environment variable, just for the purpose of testing. This way, nominatim.json can stay the same, while the testing environment variable can still be used and modified easily.
    
    Also resolved hardcoding of nominatim URL per Shankari's request.
    nataliejschultz committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    0aed377 View commit details
    Browse the repository at this point in the history
  2. Update TestNominatim.py

    Added os import, removed print statement.
    nataliejschultz committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    01a3b4d View commit details
    Browse the repository at this point in the history
  3. Testing GH workflow file

    Changed file to run on PR (temporarily) to see if it will run.
    nataliejschultz committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    fd453e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Python command not found test + compose updates

    - Added nominatim network in docker-compose so that db and nominatim are separated. This should allow them to run on different ports, while communicating with the web server.
    - Testing to see where pythonpath is set in GH actions/if we need to specify in the runner specs.
    nataliejschultz committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    ce51ed8 View commit details
    Browse the repository at this point in the history
  2. Environment variables + prints

    Dockerfile: updated query url to access the nominatim container while running on web server.
    
    start_integration_tests: moved a commented out section.
    
    Nominatim.py: Added environment variable to replace nominatim.json file. added multiple prints to (hopefully) see what's going on with the tests.
    nataliejschultz committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    7efa164 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Environment variable setup, small testing changes, removing TestNomin…

    …atimBeta.
    
    Nominatim.py: removing prints
    
    TestNominatimBeta: removed and combined with testnominatim.py
    
    runIntegrationTests.sh: modified to only call TestNominatim.py, since the other integration tests don't work yet.
    
    TestNominatim.py: updated environment variable functionality to work with both AWS and the testing environment.  Modified test_geocode to only call geocode function once. Changed test query for test_get_json_geo so that it would return a list.
    nataliejschultz committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    f8e9512 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. URL testing

    Directly testing two different potential solutions to the URL query issue in GH actions. Will change the environment variable for NOMINATIM_QUERY_URL when I find the right way to call the container in the GH actions network.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6b9d98d View commit details
    Browse the repository at this point in the history
  2. URL Testing pt 2

    TestNominatim.py: commented out irrelevant tests that won't help with troubleshooting
    
    Nominatim.py: Added port to nominatim call. Trying out calling by image name instead of name of container.
    
    runIntegrationTests.sh: Added command to list out processes on 8080
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    2bb9e66 View commit details
    Browse the repository at this point in the history
  3. Removing lsof

    Did not recognize this command; trying again.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3b76ac1 View commit details
    Browse the repository at this point in the history
  4. Network naming change

    Specifying nominatim-network is separated from the service name, nominatim. It is possible that this was causing an issue with accessing the network.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    927a6f7 View commit details
    Browse the repository at this point in the history
  5. "Universal" network removal

    Trying to remove universal network at the bottom of the file, and removing http.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    1ada684 View commit details
    Browse the repository at this point in the history
  6. Multiple network changes

    Modifying network to add a bridge driver, specifying network names, adding link to nominatim network from web server, and assigning web server its own ports. All of these changes are in an attempt to allow web server to access the nominatim container and make an API call.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    c9135ed View commit details
    Browse the repository at this point in the history
  7. Reverting; new ideas.

    Since my network was working properly locally, I'm now thinking that the issue has to do with timing. I don't think the rhodeisland-nominatim container had enough time to setup and wait/listen, which caused the connection to be refused. Changes:
    
    start_integration_tests: removing echoes
    
    dockerfile: reverting to old environment variable
    
    compose: removing version(hopefully this is allowed) and reverting everything except adding condition check. This should cause web-server to wait for the nominatim service to be up and running before trying to connect. We will see!
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ccc1c46 View commit details
    Browse the repository at this point in the history
  8. Health check + env variable moved

    docker-compose: Added healthcheck to nominatim service, in tandem with restart policy for web server. Hopefully, this gives nominatim enough time to initialize. Also added environment variable for query url.
    
    Dockerfile: removed environment variable, and added to compose.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ed91603 View commit details
    Browse the repository at this point in the history
  9. Remove restart on failure

    Added --wait to docker-compose command, which supposedly will cause the other containers to wait for my nominatim service to pass its health check. Removed restart on failure, which isn't necessary with wait.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    b072a89 View commit details
    Browse the repository at this point in the history
  10. Sleep command added

    start_integration_tests: Added sleep command to directly delay starting the tests, since docker methods weren't working. This worked locally, and I could see where the health checks were taking place. Will be helpful to, at the very least, see how long nominatim needs to get started up.
    
    nominatim-docker-test.yml: Reverted to old command.
    
    TestNominatim.py: Un-commented other tests.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6794eae View commit details
    Browse the repository at this point in the history
  11. More sleep

    Giving nominatim twice as long to initialize. I cannot get my local container to not build with old image data, despite deleting the old images.
    nataliejschultz committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    93420dc View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Adding mock to bypass place_id.

    A small change while I'm working on implementing dockerize. Mock should bypass the issue with the place_id, which should get the tests to work!! :)
    nataliejschultz committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    9af4e2e View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Implementing Dockerize

    Testing dockerize. Added docker install to dockerfile, and added a line in our start_integration_tests.sh to wait for a 200 from the rhodeisland-nominatim container. Here's what it looks like on my machine:
    
    ```
    integrationtests-web-server-1  | 2023/08/28 18:27:10 Waiting for: http://rhodeisland-nominatim:8080
    integrationtests-web-server-1  | 2023/08/28 18:27:10 Received 200 from http://rhodeisland-nominatim:8080
    ```
    
     Additionally, my tests passed locally:
    ```
    integrationtests-web-server-1  | Ran 6 tests in 0.344s
    integrationtests-web-server-1  |
    integrationtests-web-server-1  | OK
    ```
    nataliejschultz committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b6bb7cb View commit details
    Browse the repository at this point in the history
  2. Adding timeout

    Adding a specified timeout that's longer than the default (10s) so that the container has a chance to start up.
    nataliejschultz committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    867287d View commit details
    Browse the repository at this point in the history
  3. More timeout

    Longer timeout test to see if nominatim will have time to initialize.
    nataliejschultz committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    bdc70ae View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Fake place creation + geofabrik testing functionality

    nominatim-docker-test.yml: added environment variable for the geofabrik query url with GitHub actions secrets. we will see if this works in this commit.
    
    docker-compose.yml: commented out healthcheck because it isn't currently doing anything useful to delay the start. Should remove completely once docker commit is working.
    
    TestNominatim.py: added functionality for geofabrik calls with GH actions secrets.
    
    Added creation of a fake place to use for testing of get_filtered_place.
    
    Added test comparing geofabrik and nominatim hard-coded calls (these may not be possible from within the container so might be removed)
    
    Added test for get_filtered_place in clean_and_resample, which passes in the fake place created above.
    
    Modified test_get_json_reverse to only check the display name for now.
    nataliejschultz committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    86d51e4 View commit details
    Browse the repository at this point in the history
  2. Query URL woes

    nominatim-docker-test: Updating geofabrik url variable, in hopes that it will be able to be passed into a call in TestNominatim.py. I have looked into it more, and I'm not sure if GH actions allows this.
    
    nominatim.py: Realized that some of my assertion errors might be related to the nominatim url environment variable not getting set properly locally, so comparing local url to the one produced in github actions.
    
    TestNominatim,py: Changing expected result for get_filtered_place. Difference was due to my error.
    nataliejschultz committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    eba9d4d View commit details
    Browse the repository at this point in the history
  3. Syntax error

    Correcting small syntax error (oops)
    nataliejschultz committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    18ba878 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Env variable testing + changing test_get_json_geo

    Added multiple tests to see if I can access the fake API key I added to GH actions secrets.
    
    Modified the test for the get_json_geo function to only look for the name of the returned place.
    nataliejschultz committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    53c3e1e View commit details
    Browse the repository at this point in the history
  2. Temp change

    Temporarily reinstating sleep; re-removing wikipedia import
    nataliejschultz committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    7c3fcbd View commit details
    Browse the repository at this point in the history
  3. trying to get workflow to go on my nominatim branch

    Seeing if this causes the workflow to run in a different area.
    nataliejschultz committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    cc09fee View commit details
    Browse the repository at this point in the history
  4. Trying to get workflow unstuck

    Two workflows became stuck with my last change. Trying to revert change and see if they become unstuck.
    nataliejschultz committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    dbdd359 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Fixing workflow

    docker-compose.yml: Adding healthcheck back in because build failed when I removed it.
    
    nominatim-docker-test.yml: changing workflow to trigger only on push to nominatim, since I'm hoping to only run this test on my test branch instead of the main branch.
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    4b1608d View commit details
    Browse the repository at this point in the history
  2. Testing workflow yet again

    Trying to see if there's a way for me to get this workflow to only run in my forked repository for now.
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    9b2ad65 View commit details
    Browse the repository at this point in the history
  3. Removing schedule temporarily

    Apparently scheduled runs won't run on forked branches, so I'm removing the schedule to see if it will run on my forked branch. This is important, because I need to get the API keys working.
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    9f4f819 View commit details
    Browse the repository at this point in the history
  4. Trying to get this workflow to run!!!

    I think I understand what's happening now and why my workflow won't run on my fork. Added a dummy print to see if this triggers anything, since my last change was just to the workflow file (which GH might not recognize as a real push?)
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    0283672 View commit details
    Browse the repository at this point in the history
  5. Still not succeeding

    Test still not running properly. Trying:
    
    yml: Just run on nominatim push. Hoping it will work now.
    
    sh: adding some more echoes to see if I can tell where the problem is arising. I've looked through the old commits and I can't see what would've gone wrong.
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    dbe4fa4 View commit details
    Browse the repository at this point in the history
  6. Removing tail

    I scoured through everything and added some prints. It looks like tail -f is messing up the web server's ability to make requests, so I'm commenting it out again. Hopefully this fixes the issue!!
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    e89ae7e View commit details
    Browse the repository at this point in the history
  7. Test worked! Now onto the variables.

    Currently successfully running all of the tests in my repo only, so I can cancel the jobs if need be. Also, I am now able to test out using API keys in the workflow. It looks like the `TEST_ENVVAR = os.environ["TEST_ENVVAR"]` method is unrecognized/invalid, so I'm removing it and trying out the .get method instead.
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5cf4a0d View commit details
    Browse the repository at this point in the history
  8. Get method test

    Verified with last test that the .get method is the preferred way to set the variable. Trying a few ways to print the variables to see how it looks; I'm nervous because the last attempt printed "None". Added a print without any secrets to see if it's setting these variables at all.
    nataliejschultz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    2c7418e View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Test string

    Seeing if something as simple as a string gets carried over to other files, or if it's stuck in the workflow file.
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    2b0c1e6 View commit details
    Browse the repository at this point in the history
  2. Formatting change

    Adding spaces to see if that fixes the secret not being set. Also, trying to access the variables directly without using the get method.
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    1ddc01b View commit details
    Browse the repository at this point in the history
  3. Reinstating get method

    Removing prints that caused workflow to fail
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    72e4b77 View commit details
    Browse the repository at this point in the history
  4. Moving envs

    Trying a few more things before I give up on GH actions secrets. Moving the environment variables to be after the run command, as that's what I've seen in many examples. If that doesn't work, I'm going to try to move it to the jobs section of the workflow file.
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    60d2b6b View commit details
    Browse the repository at this point in the history
  5. Moving env vars around

    Moved environment variables to jobs section to hopefully make them accessible throughout the workflow.  Added an echo test to see if the variables are carried to the steps. Added a print to TestNominatim.py to see if there are any environment variable keys available.
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    8f2c032 View commit details
    Browse the repository at this point in the history
  6. Trying to pass in environment variable

    It's a stretch but this could potentially be a way to pass in the api key. We will see
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    f29c601 View commit details
    Browse the repository at this point in the history
  7. Oops

    Trying again.
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    fc5d0f7 View commit details
    Browse the repository at this point in the history
  8. Moving things around (again)

    Passing in the environment variable to the run command for docker compose, and then adding the variable to the environment again in the docker-compose.yml
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    ed51883 View commit details
    Browse the repository at this point in the history
  9. Removing brackets

    Removing brackets around test key variable.
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e61066b View commit details
    Browse the repository at this point in the history
  10. Moving (again!!)

    Realized I put the test key in the wrong service. Moving to see if it could finally work!
    nataliejschultz committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    8e0c222 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Only setting env var once

    Trying out setting the environment variable just once, in the docker compose line. I have high hopes for this test :)
    nataliejschultz committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    db2ea77 View commit details
    Browse the repository at this point in the history
  2. Commenting out env

    Trying again but actually commenting out the env section!
    nataliejschultz committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    182132f View commit details
    Browse the repository at this point in the history
  3. Geofabrik formatted!

    Using what I learned from the test key and formatting for geofabrik. Also added a print if the key is not formatted properly. Removed a bunch of extra prints and test variables. I am really hopeful that the test_geofabrik_api test will finally get to run!
    nataliejschultz committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    aa11c5a View commit details
    Browse the repository at this point in the history
  4. Modifying test_geofabrik_and_nominatim

    Modified test substantially to verify that multiple k,v pairs are equal. The raw json results are substantially different, so it is not viable to compare them. Test is passing locally.
    nataliejschultz committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    b9d500e View commit details
    Browse the repository at this point in the history
  5. Fixing test_get_json_geo

    Replaced address called with one that I know the container has (since the function is used elsewhere in the container).
    
    Decided to use the same format as I used for test_geofabrik_and_nominatim to compare the results.
    
    Test is passing locally.
    nataliejschultz committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    baa6bee View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Modifying test_nominatim_aapi

    Only looking at the first 30 characters of the display name at the moment so that the test will pass
    nataliejschultz committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    7a1974f View commit details
    Browse the repository at this point in the history
  2. Constraining both results

    Changing to the first 71 characters + constraining the docker result as well.
    nataliejschultz committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    e941b5f View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Using new container with preloaded data

    Since the tests are passing, I decided to try out docker commit to further optimize test time. Depending on how long it takes to build the container, I might remove the dockerize functionality.
    
    Also added some comments about what the tests do.
    nataliejschultz committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    8377b59 View commit details
    Browse the repository at this point in the history
  2. New image

    Created a new image without the wikipedia info, since this apparently changed how the container was created. I'm not sure if docker commit is actually going to make this faster based on the logs from my last test.
    nataliejschultz committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    ebb77f5 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Testing new docker image

    Created a new image using highly controlled container. Seeing what happens when I push this; I might have to change the entrypoint, but I'm hoping not.
    nataliejschultz committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    90b7063 View commit details
    Browse the repository at this point in the history
  2. Testing entrypoint

    Testing out new entrypoint. Also fixed some of the minor changes from Shankari's code review.
    nataliejschultz committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    5fbf161 View commit details
    Browse the repository at this point in the history
  3. Testing 4.0 version

    Created a new image and added the required file to skip download. Going to see how this one works :)
    nataliejschultz committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    4c9c915 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. More edits

    compose: Removing healthcheck since the new image is running much faster
    
    start tests script: Modified with Shankari's suggestions + removing sleep functionality
    
    nominatim.py: updating URL + adding potentially helpful print statements
    
    workflow file: adding in commented section for schedule; will un-comment out once everything is good!
    nataliejschultz committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    ec73542 View commit details
    Browse the repository at this point in the history
  2. Removing ground truth

    Removing the ground truth file + fixing a syntax error in my last commit.
    nataliejschultz committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    4d46b20 View commit details
    Browse the repository at this point in the history
  3. Fixing print; removing db port

    Seeing how it runs when I remove the database port.
    nataliejschultz committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    d1bdecb View commit details
    Browse the repository at this point in the history
  4. Removing webserver

    Changing services per shankari's requests one step at a time. Removing the webserver export now
    nataliejschultz committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    8cc7187 View commit details
    Browse the repository at this point in the history
  5. Removing port 8080!

    Let's see what happens!
    nataliejschultz committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    88b0030 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Re-adding port 8080

    Test does not work without it!!
    nataliejschultz committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    8a6d339 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. createfakeplace.py + removing dockerize + setup_integrationtests.sh

    docker-compose.tests.yml: removing whitespace (My test doesn't use this file, so it must have been added there on accident)
    
    dockerfile: removing dockerize and extra print
    
    start_integration_tests: removing dockerize wait command and some extra whitespaces
    
    setup_integrationtests.sh: created a new shell script that's separate from setup_tests.sh. essentially the same, but added a line to run createfakeplace.py
    
    createfakeplace.py: creates a fake place to be used in testnominatim.py
    
    testnominatim.py: added functionality for createfakeplace.py.
    nataliejschultz committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1e90c65 View commit details
    Browse the repository at this point in the history
  2. Another whitespace

    Removing another whitespace that I didn't see previously :)
    nataliejschultz committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    5050a66 View commit details
    Browse the repository at this point in the history
  3. Removing db.conf

    Removing the db.conf file and updating a comment in testnominatim.py
    nataliejschultz committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    518fdb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. The big one!

    I am almost positive I have the URL formatting how it is supposed to be. All of the tests are passing locally. Here's what I've done:
    
    TestNominatim.py:
     - Created a new module that sets the query URL to be used in nominatim.py and reloads nominatim.py. This allows the user to call the various nominatim services anywehre in the code, without modifying nominatim.py.
    
    - added setup function for consistency with other tests
    
    docker-compose: added query URLs as environment variables for the web-server service.
    
    nominatim.py: set the nominatim_query_url as an environment variable in a more simple way.
    nataliejschultz committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    09e240f View commit details
    Browse the repository at this point in the history
  2. Cleanup

    After last push, now that I know it works, removing some unnecessary things and reinstating the testing schedule.
    nataliejschultz committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    80519bb View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Cleanup (2)

    - Deleting createfakeplace.py and setup_integrationtests.sh
    
    - Reverting to setup_tests.sh in start_integration_tests.sh
    
    - Moving creation of fake place to TestNominatim.py setup  function
    
    - Adding logging for query URL and modifying a print in nominatim.py
    nataliejschultz committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    d31df8c View commit details
    Browse the repository at this point in the history
  2. Emission network only

    Trying out running the test on only one network. Also adding in run on push to nominatim branch so that the test runs again!
    nataliejschultz committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    efb963c View commit details
    Browse the repository at this point in the history
  3. Workflow test

    Workflow wasn't going on last push due to changes to schedule, so reverting temporarily.
    nataliejschultz committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    a55a9ad View commit details
    Browse the repository at this point in the history
  4. Reverting workflow (final push?!)

    This could be it! Reverting to the scheduled runs.
    nataliejschultz committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    3ce7e5b View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Pull on paths

    Committing Shankari's suggestion
    
    Co-authored-by: shankari <[email protected]>
    nataliejschultz and shankari authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    b779c1f View commit details
    Browse the repository at this point in the history
  2. Removing port 8080 (again)

    Trying out removal of port 8080 now that all of the services are on the same network. Hopefully, the container can call by just the name of the container and not expose the port.
    
    Also adding to run on push to one of the paths so that the test runs.
    nataliejschultz committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    1c7cb3c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    693407e View commit details
    Browse the repository at this point in the history
  4. Re-Adding port 8080 (again)

    Despite being on one network, calling the container by name might have messed things up.
    
    Also adding a print for debugging.
    nataliejschultz committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    70ff4ab View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Pulling repo secret

    Slightly modifying the workflow to see if the API key can be pulled to the workflow successfully.
    nataliejschultz committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    fa508ad View commit details
    Browse the repository at this point in the history
  2. Replacing secret

    Replacing the API key with a known working repo secret to see if the problem is GH accessing the repo secrets, or something with the way the secret was put in.
    nataliejschultz committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    a6be71a View commit details
    Browse the repository at this point in the history
  3. Setting secret as env var in workflow file

    Setting the geofabrik api key as an environment variable prior to running compose. Hopefully, this will pull the secret properly and allow it to be used in the workflow.
    nataliejschultz committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    451a428 View commit details
    Browse the repository at this point in the history
  4. Switching to using docker_user until I figure this out.

    Using DOCKER_USER in place of GEOFABRIK_API until the secret is successfully carried through to the test.
    nataliejschultz committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    b027485 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Secret issues

    echoing the secret to see if it's being pulled at all
    nataliejschultz committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2000144 View commit details
    Browse the repository at this point in the history
  2. Adding quotes

    Maybe it's because the quotes are not there?
    nataliejschultz committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    e3b93eb View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Updating readme + Making sure the test still works (running on fork)

    Adding the workflow status badge to the readme
    
    Running the test on my fork again before making further changes.
    nataliejschultz committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    0b9e455 View commit details
    Browse the repository at this point in the history
  2. Getting test to run on my branch again

    ???? Not sure why it didn't run last push.
    nataliejschultz committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    ce2db01 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Removing port 8080 (yet again!!)

    Previous run of this test succeeded. Going to see what happens when I remove port 8080 as the only change (again)
    nataliejschultz committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    3bf52de View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Re-adding port + setup changes

    final changes (I hope!) to setup module + re-adding the port since the test did not work without it.
    nataliejschultz committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    8c2efb0 View commit details
    Browse the repository at this point in the history
  2. Re-instating schedule (test will fail but that is expected)

    Reverting to running test on schedule since (I think) everything else is done.
    nataliejschultz committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    b7e0165 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f5c35a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Configuration menu
    Copy the full SHA
    baf087a View commit details
    Browse the repository at this point in the history