small changes to get travis working

Makefile

@@ -56,14 +56,14 @@ clean: clean-exec-image
 clean-exec-image:
 	- docker rm -f $(DOCKER_NAME) 2> /dev/null || :
 	- docker rmi $(image-string):{$(DOCKER_TAG),$(DOCKER_LATEST)} 2> /dev/null || :
-	rm -f .docker-exec .docker-exec-run
+	rm -f .docker-exec*
 
 # Also remove the bld image/container
 clean-all: clean
 	- docker rm -f $(DOCKER_NAME)_bld 2> /dev/null || :
 	- docker rmi $(image-string):bld 2> /dev/null || :
 	- docker network remove $(DOCKER_NETWORK) 2> /dev/null || :
-	rm -f .docker-bld .docker-network
+	rm -f .docker-*
 
 # rem-docker-bld:
 # 	- docker rm -f $(DOCKER_NAME)_bld 2> /dev/null || :

README.md

@@ -175,6 +175,10 @@ To build an exchange container with code that is targeted for a git branch:
     - If maxAgreements>1, for CS, in search don't return node to agbot if agbot from same org already has agreement for same service.
     - Consider changing all creates to POST, and update (via put/patch) return codes to 200
 
+## Changes in 1.86.0
+
+- Fixed ExchConfigSuites so it works with default config.json for `make test` in travis
+
 ## Changes in 1.85.0
 
 - Added use of ICP self-signed cert

src/main/resources/version.txt

@@ -1 +1 @@
-1.85.0
+1.86.0

src/test/scala/exchangeapi/ExchConfigSuite.scala

@@ -13,14 +13,11 @@ import com.horizon.exchangeapi._
 class ExchConfigSuite extends FunSuite {
   test("ExchConfig tests") {
     ExchConfig.load()
+    // Note: this test needs to work with the default version of config.json that is in src/main/resources (so that 'make test' in travis works)
     assert(ExchConfig.getInt("api.limits.maxNodes") === 10000)
-    //assert(ExchConfig.getInt("api.limits.maxAgbots") === 1000)  // <- i usually locally test this as 0
     assert(ExchConfig.getInt("api.limits.maxAgreements") === 0)
     assert(ExchConfig.getInt("api.limits.maxMessagesInMailbox") === 10000)
-
     assert(ExchConfig.getString("api.db.driverClass") === "org.postgresql.Driver")
-    assert(ExchConfig.getString("api.db.jdbcUrl").startsWith("jdbc:"))
-//    assert(ExchConfig.getString("api.db.user") === "admin" || ExchConfig.getString("api.db.user") === "bp" || ExchConfig.getString("api.db.user") === "sadiyahfaruk")     // the local test db name is my user
     assert(ExchConfig.getInt("api.db.minPoolSize") === 1)
     assert(ExchConfig.getInt("api.db.acquireIncrement") === 1)
     assert(ExchConfig.getInt("api.db.maxPoolSize") === 50)