Hello Sahina Bose,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/39274
to review the following change.
Change subject: core: Fixed error with scheduler test
......................................................................
core: Fixed error with scheduler test
Externalized the db properties that are used
for the scheduler tests
Change-Id: Ic35c178c041aed37235510c6452dae21f2cd1585
Signed-off-by: Sahina Bose <[email protected]>
---
M backend/manager/modules/scheduler/pom.xml
A backend/manager/modules/scheduler/src/test/filters/pgsql.properties
M
backend/manager/modules/scheduler/src/test/resources/ovirt-db-scheduler-test.properties
3 files changed, 27 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/39274/1
diff --git a/backend/manager/modules/scheduler/pom.xml
b/backend/manager/modules/scheduler/pom.xml
index 7e7e588..9665a37 100644
--- a/backend/manager/modules/scheduler/pom.xml
+++ b/backend/manager/modules/scheduler/pom.xml
@@ -11,7 +11,9 @@
<packaging>ejb</packaging>
<name>engine scheduler bean</name>
-
+ <properties>
+ <engine.db>pgsql</engine.db>
+ </properties>
<dependencies>
<dependency>
<groupId>${engine.groupId}</groupId>
@@ -38,12 +40,21 @@
</dependencies>
<build>
+ <filters>
+ <filter>src/test/filters/${engine.db}.properties</filter>
+ </filters>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
diff --git
a/backend/manager/modules/scheduler/src/test/filters/pgsql.properties
b/backend/manager/modules/scheduler/src/test/filters/pgsql.properties
new file mode 100644
index 0000000..2621c47
--- /dev/null
+++ b/backend/manager/modules/scheduler/src/test/filters/pgsql.properties
@@ -0,0 +1,7 @@
+engine.db.username = engine
+engine.db.password = engine
+engine.db.url = jdbc:postgresql://localhost/engine_dao_tests
+engine.db.driver = org.postgresql.Driver
+engine.db.datafactory = org.ovirt.engine.core.dao.PostgresDataTypeFactory
+engine.db.initsql =
+engine.db.dbengine.dialect=org.ovirt.engine.core.dal.dbbroker.PostgresDbEngineDialect
diff --git
a/backend/manager/modules/scheduler/src/test/resources/ovirt-db-scheduler-test.properties
b/backend/manager/modules/scheduler/src/test/resources/ovirt-db-scheduler-test.properties
index 0dbbdde..869836b 100644
---
a/backend/manager/modules/scheduler/src/test/resources/ovirt-db-scheduler-test.properties
+++
b/backend/manager/modules/scheduler/src/test/resources/ovirt-db-scheduler-test.properties
@@ -10,14 +10,14 @@
org.quartz.threadPool.threadCount=50
org.quartz.jobStore.nonManagedTXDataSource=NMEngineDS
-org.quartz.dataSource.EngineDS.driver=org.postgresql.Driver
-org.quartz.dataSource.EngineDS.URL=jdbc:postgresql://localhost/engine_dao_tests
-org.quartz.dataSource.EngineDS.user=engine
-org.quartz.dataSource.EngineDS.password=engine
+org.quartz.dataSource.EngineDS.driver=${engine.db.driver}
+org.quartz.dataSource.EngineDS.URL=${engine.db.url}
+org.quartz.dataSource.EngineDS.user=${engine.db.username}
+org.quartz.dataSource.EngineDS.password=${engine.db.password}
org.quartz.dataSource.EngineDS.maxConnections=4
-org.quartz.dataSource.NMEngineDS.driver=org.postgresql.Driver
-org.quartz.dataSource.NMEngineDS.URL=jdbc:postgresql://localhost/engine_dao_tests
-org.quartz.dataSource.NMEngineDS.user=engine
-org.quartz.dataSource.NMEngineDS.password=engine
+org.quartz.dataSource.NMEngineDS.driver=${engine.db.driver}
+org.quartz.dataSource.NMEngineDS.URL=${engine.db.url}
+org.quartz.dataSource.NMEngineDS.user=${engine.db.username}
+org.quartz.dataSource.NMEngineDS.password=${engine.db.password}
org.quartz.dataSource.NMEngineDS.maxConnections=4
\ No newline at end of file
--
To view, visit https://gerrit.ovirt.org/39274
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic35c178c041aed37235510c6452dae21f2cd1585
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Shubhendu Tripathi <[email protected]>
Gerrit-Reviewer: Sahina Bose <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
