|
Stanislav Ochotnicky |
826f3f0 |
From 7cf7e60b9ce308cf7d0cbbe3da142781ce736696 Mon Sep 17 00:00:00 2001
|
|
Stanislav Ochotnicky |
826f3f0 |
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
Stanislav Ochotnicky |
826f3f0 |
Date: Wed, 29 Jan 2014 17:40:39 +0100
|
|
Stanislav Ochotnicky |
826f3f0 |
Subject: [PATCH 02/15] [test] Fix testsuite for java-headless change
|
|
Stanislav Ochotnicky |
826f3f0 |
|
|
Stanislav Ochotnicky |
826f3f0 |
---
|
|
Stanislav Ochotnicky |
826f3f0 |
test/maven_req_test.py | 4 ++--
|
|
Stanislav Ochotnicky |
826f3f0 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Stanislav Ochotnicky |
826f3f0 |
|
|
Stanislav Ochotnicky |
826f3f0 |
diff --git a/test/maven_req_test.py b/test/maven_req_test.py
|
|
Stanislav Ochotnicky |
826f3f0 |
index 4551bb5..b99672f 100644
|
|
Stanislav Ochotnicky |
826f3f0 |
--- a/test/maven_req_test.py
|
|
Stanislav Ochotnicky |
826f3f0 |
+++ b/test/maven_req_test.py
|
|
Stanislav Ochotnicky |
826f3f0 |
@@ -26,7 +26,7 @@ class TestMavenReq(unittest.TestCase):
|
|
Stanislav Ochotnicky |
826f3f0 |
@mavenreq(["require-java/require.xml"])
|
|
Stanislav Ochotnicky |
826f3f0 |
def test_require_java(self, stdout, stderr, return_value):
|
|
Stanislav Ochotnicky |
826f3f0 |
self.assertEquals(return_value, 0, stderr)
|
|
Stanislav Ochotnicky |
826f3f0 |
- self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\n")
|
|
Stanislav Ochotnicky |
826f3f0 |
+ self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava-headless >= 1:1.6\n")
|
|
Stanislav Ochotnicky |
826f3f0 |
|
|
Stanislav Ochotnicky |
826f3f0 |
@mavenreq(["require-java-devel/require.xml"])
|
|
Stanislav Ochotnicky |
826f3f0 |
def test_require_java_devel(self, stdout, stderr, return_value):
|
|
Stanislav Ochotnicky |
826f3f0 |
@@ -36,7 +36,7 @@ class TestMavenReq(unittest.TestCase):
|
|
Stanislav Ochotnicky |
826f3f0 |
@mavenreq(["require-java-both/require.xml"])
|
|
Stanislav Ochotnicky |
826f3f0 |
def test_require_java_both(self, stdout, stderr, return_value):
|
|
Stanislav Ochotnicky |
826f3f0 |
self.assertEquals(return_value, 0, stderr)
|
|
Stanislav Ochotnicky |
826f3f0 |
- self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\njava-devel >= 1:1.6\n")
|
|
Stanislav Ochotnicky |
826f3f0 |
+ self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava-headless >= 1:1.6\njava-devel >= 1:1.6\n")
|
|
Stanislav Ochotnicky |
826f3f0 |
|
|
Stanislav Ochotnicky |
826f3f0 |
@mavenreq(["require_parent/require.xml"])
|
|
Stanislav Ochotnicky |
826f3f0 |
def test_require_parent(self, stdout, stderr, return_value):
|
|
Stanislav Ochotnicky |
826f3f0 |
--
|
|
Stanislav Ochotnicky |
826f3f0 |
1.8.5.3
|
|
Stanislav Ochotnicky |
826f3f0 |
|