Add script for style testing #2436
Open
+1,337
−1,224
Conversation
This file contains hidden or 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
Windows can't handle the paths properly.
Windows needs external setup to function properly.
joto
requested changes
Dec 3, 2025
| Per default, behave assumes that the build directory is under `osm2pgsql/build`. | ||
| If your setup works like that, you can leave out the `-D` parameter. | ||
|
|
||
| To make this a bit easier a shell script `run-behave` is provided in your |
Collaborator
There was a problem hiding this comment.
If I understand this correctly, run-behave is not installed any more, but still mentioned here.
|
|
||
| def __call__(self, base_url): | ||
| assert base_url == self.expected_base_url,\ | ||
| f"Wrong replication service called. Expected '{self.expected_base_url}', got '{base_url}'" |
Collaborator
There was a problem hiding this comment.
Line continuation formatting with backslash is inconsistent in whole file: sometimes with, somtimes without space in front.
Also: There are some line continuations after a comma which should not be needed?
|
|
||
| if output is not None: | ||
| context.osm2pgsql_params['-O'] = output.strip() | ||
| if output == ' pgsql' and 'S' not in context.osm2pgsql_params: |
Collaborator
There was a problem hiding this comment.
Shouldn't this bis '-S' not in?
| context.osm2pgsql_cmdline = ' '.join(cmdline) | ||
| context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata] | ||
| context.osm2pgsql_returncode = proc.returncode | ||
| context.osm2pgsql_params = {'-d': context.user_args.test_db} |
Collaborator
There was a problem hiding this comment.
Why is this set here after building the command line in line 503 and 507?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the script osm2pgsql-test-style which allows blackbox testing of osm2pgsql lua styles. The script uses the same BDD test style as already introduced with osm2pgsql's integration tests. For details and documentation see: osm2pgsql-dev/osm2pgsql-website#78
The PR also changes the internal tests to use the style tester. The semantics of the steps have slightly changed to make them more consistent and understandable. So there were some changes to the tests necessary, most notably:
ST_AsText()but use the!geomatcher instead.Note: the tester originally also changed the behaviour with respect to environment variables and ignored the ones set outside. However, it turns out that
pg_virtualenvneeds somePG*variables set to have osm2pgsql use the right cluster. And the Windows CI just refused to do such basic things like name resolution when some of its variables are unset. I've not further investigated but simply reinstated the previous behaviour of forwarding all environment variables.