Skip to content

Commit 43c03de

Browse files
author
afabiani
committed
- Fix CircleCI Test Cases
1 parent c7c71d7 commit 43c03de

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

geonode/geoserver/tests/test_helpers.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -132,37 +132,37 @@ def test_replace_callback(self):
132132
<MetadataURL type="other">
133133
<Format>other</Format>
134134
<OnlineResource xlink:type="simple"
135-
xlink:href="http://localhost:8080/catalogue/csw?outputschema=...."/>
135+
xlink:href="http://geoserver:8080/catalogue/csw?outputschema=...."/>
136136
</MetadataURL>
137137
<MetadataURL type="other">
138138
<Format>other</Format>
139139
<OnlineResource xlink:type="simple"
140-
xlink:href="http://localhost:8080/catalogue/csw?outputschema=...."/>
140+
xlink:href="http://geoserver:8080/catalogue/csw?outputschema=...."/>
141141
</MetadataURL>
142142
<MetadataURL type="other">
143143
<Format>other</Format>
144144
<OnlineResource xlink:type="simple"
145-
xlink:href="http://localhost:8080/catalogue/csw?outputschema=...."/>
145+
xlink:href="http://geoserver:8080/catalogue/csw?outputschema=...."/>
146146
</MetadataURL>
147147
<MetadataURL type="other">
148148
<Format>other</Format>
149149
<OnlineResource xlink:type="simple"
150-
xlink:href="http://localhost:8080/catalogue/csw?outputschema=...."/>
150+
xlink:href="http://geoserver:8080/catalogue/csw?outputschema=...."/>
151151
</MetadataURL>
152152
<MetadataURL type="FGDC">
153153
<Format>text/xml</Format>
154154
<OnlineResource xlink:type="simple"
155-
xlink:href="http://localhost:8080/catalogue/csw?outputschema=...."/>
155+
xlink:href="http://geoserver:8080/catalogue/csw?outputschema=...."/>
156156
</MetadataURL>
157157
<MetadataURL type="other">
158158
<Format>other</Format>
159159
<OnlineResource xlink:type="simple"
160-
xlink:href="http://localhost:8080/catalogue/csw?outputschema=...."/>
160+
xlink:href="http://geoserver:8080/catalogue/csw?outputschema=...."/>
161161
</MetadataURL>
162162
<MetadataURL type="other">
163163
<Format>other</Format>
164164
<OnlineResource xlink:type="simple"
165-
xlink:href="http://localhost:8080/showmetadata/xsl/584"/>
165+
xlink:href="http://geoserver:8080/showmetadata/xsl/584"/>
166166
</MetadataURL>
167167
<Style>
168168
<Name>geonode:DE_USNG_UTM18</Name>
@@ -172,7 +172,7 @@ def test_replace_callback(self):
172172
<Format>image/png</Format>
173173
<OnlineResource
174174
xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"
175-
xlink:href="http://localhost:8080/geoserver/ows?service=WMS&amp;request=GetLegendGraphic&...."/>
175+
xlink:href="http://geoserver:8080/geoserver/ows?service=WMS&amp;request=GetLegendGraphic&...."/>
176176
</LegendURL>
177177
</Style>
178178
</Layer>"""

geonode/security/tests.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -744,13 +744,12 @@ def test_layer_upload_with_time(self):
744744
store = get_store(gs_catalog, saved_layer.store, workspace=ws)
745745
self.assertIsNotNone(store)
746746

747-
# url = settings.OGC_SERVER['default']['LOCATION']
748-
url = 'http://geoserver:8080/geoserver/'
747+
url = settings.OGC_SERVER['default']['LOCATION']
749748
user = settings.OGC_SERVER['default']['USER']
750749
passwd = settings.OGC_SERVER['default']['PASSWORD']
751750

752751
rest_path = 'rest/workspaces/geonode/datastores/{lyr_title}/featuretypes/{lyr_name}.xml'.\
753-
format(lyr_title=title, lyr_name=name)
752+
format(lyr_title=saved_layer.store, lyr_name=name)
754753
import requests
755754
from requests.auth import HTTPBasicAuth
756755
r = requests.get(url + rest_path,

test.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
22
set -e
3+
. $HOME/.override_env
34

4-
coverage run --branch --source=geonode manage.py test $@
5+
coverage run --branch --source=geonode manage.py test -v 3 --keepdb $@

0 commit comments

Comments
 (0)