You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/27 00:54:48 UTC

[33/50] [abbrv] tinkerpop git commit: Minor change to ant-run plugin so as to allow binding to test.

Minor change to ant-run plugin so as to allow binding to test.

Without this change binding exec-plugin to test imposes a block in maven that requires user input.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4191efc5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4191efc5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4191efc5

Branch: refs/heads/master
Commit: 4191efc59c0a8323468d9cc2b5f6735869c3301d
Parents: 9e449df
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 26 09:25:51 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 26 09:25:51 2016 -0400

----------------------------------------------------------------------
 gremlin-python/pom.xml | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4191efc5/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 9a6d75b..d7006f9 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -98,17 +98,37 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>createThriftDir</id>
+                        <id>create-python-reports-directory</id>
                         <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <tasks>
                                 <delete dir="${build.directory}/python-reports"/>
                                 <mkdir dir="${build.directory}/python-reports"/>
                             </tasks>
                         </configuration>
+                    </execution>
+                    <!--
+                    use pytest to execute native python tests - output of xunit output is configured in setup.cfg.
+                    had to use the ant plugin - maven-exec-plugin
+                    -->
+                    <execution>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
+                        <configuration>
+                            <skip>${skipTests}</skip>
+                            <target>
+                                <exec executable="python"
+                                      dir="${basedir}/target/python">
+                                    <arg value="setup.py"/>
+                                    <arg value="test"/>
+                                </exec>
+                            </target>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -144,23 +164,6 @@
                             </commandlineArgs>
                         </configuration>
                     </execution>
-                    <!-- use pytest to execute native python tests - output of xunit output is configured in setup.cfg -->
-                    <execution>
-                        <id>test-python</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>python</executable>
-                            <workingDirectory>${basedir}/target/python</workingDirectory>
-                            <skip>${skipTests}</skip>
-                            <arguments>
-                                <argument>setup.py</argument>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>