File: 0002-fix-perforce-tests.patch

package info (click to toggle)
maven-scm 1.3-5
  • links: PTS, VCS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 7,652 kB
  • ctags: 6,030
  • sloc: java: 45,743; xml: 3,290; sh: 470; makefile: 6
file content (20 lines) | stat: -rw-r--r-- 952 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Description: Fixes the Perfoce tests to run with the latest version of JUnit (backported from maven-scm 1.9)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: yes
--- a/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
@@ -43,6 +43,14 @@
 
     private static final String cmdPrefix = "p4 -d " + workingDirectory.getAbsolutePath();
 
+    @Override
+    protected void tearDown()
+        throws Exception
+    {
+        // Some tests don't expect this property, so when tests are executed in random order these might fail
+        System.clearProperty( PerforceScmProvider.DEFAULT_CLIENTSPEC_PROPERTY );
+    }
+
     public void testGetCommandLine()
         throws Exception
     {