From d3b2089e893907d59b88e510a0478bf9deb52a96 Mon Sep 17 00:00:00 2001
From: Nikita Vakula <52108696+krjakbrjak@users.noreply.github.com>
Date: Wed, 16 Jun 2021 09:49:02 +0200
Subject: [PATCH] [python-fastapi] Fixed integration tests (#9771)

* [python-fastapi] Fixed integration tests

Currently, it is required to use python 3.7 to make
python-fastapi generator work. This version is already
set in the generated Dockerfile. Thus, it makes sense to
build this image. Spotify's docker maven plugin can be
used to build the docker image.

Signed-off-by: Nikita Vakula <programmistov.programmist@gmail.com>

* fixup! [python-fastapi] Fixed integration tests

Signed-off-by: Nikita Vakula <programmistov.programmist@gmail.com>
---
 pom.xml                                       |  3 +-
 .../server/petstore/python-fastapi/pom.xml    | 11 +++----
 .../petstore/python-fastapi/test_python3.sh   | 33 -------------------
 3 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100755 samples/server/petstore/python-fastapi/test_python3.sh

diff --git a/pom.xml b/pom.xml
index c33cc976442..a78fee85d3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1187,8 +1187,7 @@
                 <!-- servers -->
                 <module>samples/server/petstore/python-aiohttp</module>
                 <module>samples/server/petstore/python-aiohttp-srclayout</module>
-                <!-- comment out due to errors in the ci
-                <module>samples/server/petstore/python-fastapi</module>-->
+                <module>samples/server/petstore/python-fastapi</module>
                 <module>samples/server/petstore/python-flask</module>
                 <!-- TODO: will move these to Github action
                 <module>samples/server/petstore/php-slim4</module>
diff --git a/samples/server/petstore/python-fastapi/pom.xml b/samples/server/petstore/python-fastapi/pom.xml
index 13e3a7288c4..cec32c1dc9a 100644
--- a/samples/server/petstore/python-fastapi/pom.xml
+++ b/samples/server/petstore/python-fastapi/pom.xml
@@ -22,19 +22,16 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
                 <executions>
                     <execution>
                         <id>test</id>
                         <phase>integration-test</phase>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>build</goal>
                         </goals>
-                        <configuration>
-                            <executable>./test_python3.sh</executable>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/samples/server/petstore/python-fastapi/test_python3.sh b/samples/server/petstore/python-fastapi/test_python3.sh
deleted file mode 100755
index 77f1eb71b93..00000000000
--- a/samples/server/petstore/python-fastapi/test_python3.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-
-REQUIREMENTS_FILE=requirements.txt
-REQUIREMENTS_OUT=requirements.txt.log
-SETUP_OUT=*.egg-info
-VENV=.venv
-DEACTIVE=false
-
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-
-### set virtualenv
-if [ -z "$VIRTUAL_ENV" ]; then
-		virtualenv $VENV --no-site-packages --always-copy --python python3
-		source $VENV/bin/activate
-    DEACTIVE=true
-fi
-
-### install dependencies
-pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT
-
-### run tests
-PYTHONPATH=src pytest tests
-
-### static analysis of code
-#flake8 --show-source src/
-
-### deactivate virtualenv
-if [ $DEACTIVE == true ]; then
-    deactivate
-fi