add pyOpenSSL to the list of packages to pip2 install for sfa

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 3510430..7befc3f 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1521,6 +1521,8 @@ class TestPlc:
 
     def install_pip2(self):
 
+        # xxx could make sense to mirror this one
+
         replacements = [
             "https://acc.dl.osdn.jp/storage/g/u/un/unitedrpms/32/x86_64/python2-pip-19.1.1-7.fc32.noarch.rpm",
         ]
@@ -1528,7 +1530,7 @@ class TestPlc:
         return (
                self.run_in_guest("pip2 --version") == 0
             or self.run_in_guest("dnf install python2-pip") == 0
-            or self.run_in_guest("dnf localinstall -y " + " ".join(replacements)))
+            or self.run_in_guest("dnf localinstall -y " + " ".join(replacements)) == 0)
 
 
     def install_m2crypto(self):
@@ -1545,12 +1547,10 @@ class TestPlc:
         ]
 
         return (
-               self.run_in_guest('python2 -c "import M2Crypto"', backslash=True)
+               self.run_in_guest('python2 -c "import M2Crypto"', backslash=True) == 0
             or self.run_in_guest("pip2 install python2-m2crypto") == 0
             or self.run_in_guest("dnf localinstall -y " + " ".join(replacements)) == 0)
 
-        return attempt
-
         # about pip2:
         # we can try and use
         # that qould then need to be mirrored
@@ -1572,6 +1572,7 @@ class TestPlc:
             'lxml',
             'python-dateutil',
             'psycopg2-binary',
+            'pyOpenSSL',
         ]
 
         return (