[java-identity-provider] branch master updated: Fix errors when database is reused.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=e58f1a54ff7e2d379b22bd639563fbb296a31353

The following commit(s) were added to refs/heads/master by this push:
       new  e58f1a54f Fix errors when database is reused.
e58f1a54f is described below

commit e58f1a54ff7e2d379b22bd639563fbb296a31353
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 6 14:23:33 2020 -0400

    Fix errors when database is reused.
---
 idp-conf/src/test/resources/conf/global.xml    | 2 +-
 idp-conf/src/test/resources/test/test-jdbc.sql | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/conf/global.xml
index 2cf7f1e2b..d5992b4f7 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/conf/global.xml
@@ -80,7 +80,7 @@
         <property name="password" value="" />
     </bean>
 
-    <jdbc:initialize-database data-source="testbed.JDBCDataSource">
+    <jdbc:initialize-database data-source="testbed.JDBCDataSource" ignore-failures="ALL">
         <jdbc:script location="classpath:/test/test-jdbc.sql"/>
     </jdbc:initialize-database>
     
diff --git a/idp-conf/src/test/resources/test/test-jdbc.sql b/idp-conf/src/test/resources/test/test-jdbc.sql
index 294b108a0..17dd942f6 100644
--- a/idp-conf/src/test/resources/test/test-jdbc.sql
+++ b/idp-conf/src/test/resources/test/test-jdbc.sql
@@ -1,3 +1,4 @@
+DROP TABLE shibpid;
 CREATE TABLE shibpid (
 	localEntity VARCHAR(100) NOT NULL, 
 	peerEntity VARCHAR(100) NOT NULL,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.