You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/02/09 15:21:28 UTC
svn commit: r1729389 - in /jackrabbit/branches/2.6: ./
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
Author: reschke
Date: Tue Feb 9 14:21:27 2016
New Revision: 1729389
URL: http://svn.apache.org/viewvc?rev=1729389&view=rev
Log:
OAK-3949: fix DbClusterTestJCR3162 to restore system property SYSTEM_PROPERTY_NODE_ID to previous value (ported to 2.6)
Modified:
jackrabbit/branches/2.6/ (props changed)
jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 9 14:21:27 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1437334,1437374,1437384,1437618,1437928,1437933,1437963,1438158,1438541,1439296,1439312,1439346,1439768,1439797,1439927,1440059,1440336,1440456,1440908,1440917,1442061,1443652,1443876,1443885,1443943,1444501,1444515,1444654,1444666,1444683,1444755,1445122,1445134,1453907,1460995,1461064,1461137,1461613,1461646,1462115,1462153,1462205,1462211,1465974,1466060,1466085,1466938,1467255,1467363,1468965,1469312,1469799,1469892,1469940,1470573,1470957,1471286,1475718,1478684,1478719,1478757,1479518,1479527,1479533,1479536,1479691,1479809,1479908,1480574,1481964,1483276,1483286,1484440,1484442,1484444,1484727,1487803,1497243,1497492,1497787,1498840,1498850,1499285,1505795,1505907,1505942,1506594,1506877,1508053,1509101,1513144,1516281,1517602,1517627,1519376,1525629,1525633,1526928,1526945,1530005,1535539,1537027,1539030,1539045,1539050,1556248,1566668-1566669,1582373,1587619,1590030,1590733,1598035,1598058,1603934,1609712,1634584,1680757
+/jackrabbit/trunk:1437334,1437374,1437384,1437618,1437928,1437933,1437963,1438158,1438541,1439296,1439312,1439346,1439768,1439797,1439927,1440059,1440336,1440456,1440908,1440917,1442061,1443652,1443876,1443885,1443943,1444501,1444515,1444654,1444666,1444683,1444755,1445122,1445134,1453907,1460995,1461064,1461137,1461613,1461646,1462115,1462153,1462205,1462211,1465974,1466060,1466085,1466938,1467255,1467363,1468965,1469312,1469799,1469892,1469940,1470573,1470957,1471286,1475718,1478684,1478719,1478757,1479518,1479527,1479533,1479536,1479691,1479809,1479908,1480574,1481964,1483276,1483286,1484440,1484442,1484444,1484727,1487803,1497243,1497492,1497787,1498840,1498850,1499285,1505795,1505907,1505942,1506594,1506877,1508053,1509101,1513144,1516281,1517602,1517627,1519376,1525629,1525633,1526928,1526945,1530005,1535539,1537027,1539030,1539045,1539050,1556248,1566668-1566669,1582373,1587619,1590030,1590733,1598035,1598058,1603934,1609712,1634584,1680757,1729382
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java?rev=1729389&r1=1729388&r2=1729389&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java Tue Feb 9 14:21:27 2016
@@ -53,6 +53,8 @@ public class DbClusterTestJCR3162 extend
private String clusterId1 = UUID.randomUUID().toString();
private String clusterId2 = UUID.randomUUID().toString();
+ private String prevClusterId;
+
public void setUp() throws Exception {
deleteAll();
FileUtils
@@ -66,7 +68,7 @@ public class DbClusterTestJCR3162 extend
"./src/test/resources/org/apache/jackrabbit/core/cluster/repository-h2.xml"),
new File("./target/dbClusterTest/node2/repository.xml"));
- System.setProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID, clusterId1);
+ prevClusterId = System.setProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID, clusterId1);
rep1 = RepositoryImpl.create(RepositoryConfig.create(new File(
"./target/dbClusterTest/node1")));
@@ -75,6 +77,14 @@ public class DbClusterTestJCR3162 extend
}
public void tearDown() throws Exception {
+ // revert change to system property
+ if (prevClusterId == null) {
+ System.clearProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID);
+ }
+ else {
+ System.setProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID, prevClusterId);
+ }
+
try {
rep1.shutdown();
if (rep2 != null) {
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java?rev=1729389&r1=1729388&r2=1729389&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java Tue Feb 9 14:21:27 2016
@@ -245,6 +245,10 @@ public class RepositoryConfigTest extend
public void testAutomaticClusterNodeIdCreation() throws Exception {
final long syncDelay = 12;
+ assertNull(
+ "This test requires the system property " + ClusterNode.SYSTEM_PROPERTY_NODE_ID + " not to be set; found value: "
+ + System.getProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID) + " (leftover from broken unit test?)",
+ System.getProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID));
System.setProperty("cluster.syncDelay", Long.toString(syncDelay));
try {
File file = new File(DIR, "cluster_node.id");