create module for selenium libraries

jscotka · martinpitt · commit bdd5f1e9f653 · 2018-11-28T14:07:53.000+01:00
Closes cockpit-project#10675
diff --git a/test/avocado/checkexample-foo.py b/test/avocado/checkexample-foo.py
@@ -23,7 +23,7 @@
 import sys
 import os
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
-import cockpit
+from testlib_avocado import cockpit
 
 
 class checkexample_foo(Test):
diff --git a/test/avocado/checklogin-basic.py b/test/avocado/checklogin-basic.py
@@ -23,7 +23,8 @@
 import sys
 import os
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
-import cockpit
+
+from testlib_avocado import cockpit
 
 username = "user"
 
diff --git a/test/avocado/checklogin-raw.py b/test/avocado/checklogin-raw.py
@@ -27,7 +27,7 @@
 import sys
 import os
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
-import cockpit
+from testlib_avocado import cockpit
 
 
 machine = "localhost"
diff --git a/test/avocado/checkrealms-basic.py b/test/avocado/checkrealms-basic.py
@@ -22,7 +22,7 @@
 from avocado.utils import process
 
 from testlib import wait
-import cockpit
+from testlib_avocado import cockpit
 
 class checkrealms_basic(cockpit.Test):
     def test(self):
diff --git a/test/avocado/common b/test/avocado/common
diff --git a/test/avocado/identity b/test/avocado/identity
diff --git a/test/avocado/identity.pub b/test/avocado/identity.pub
diff --git a/test/avocado/machine_core b/test/avocado/machine_core
diff --git a/test/avocado/run-tests b/test/avocado/run-tests
@@ -28,7 +28,7 @@ CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
 if CURRENT_DIR not in sys.path:
     sys.path.insert(1, CURRENT_DIR)
 
-from machine_core import testvm
+from testlib_avocado.machine_core import testvm
 
 machine_test_dir = "/tmp/avocado_tests"
 
diff --git a/test/avocado/selenium-base.py b/test/avocado/selenium-base.py
@@ -7,17 +7,20 @@
 if not machine_test_dir in sys.path:
     sys.path.insert(1, machine_test_dir)
 
-from seleniumlib import SeleniumTest, user, clickable, passwd, visible
+from testlib_avocado.seleniumlib import SeleniumTest, user, clickable, passwd, visible
 
 class BasicTestSuite(SeleniumTest):
     """
     :avocado: enable
     """
     def test10Base(self):
+        # this is minimal cockpit test what checks login page
         self.wait_id('server-name')
         self.error = False
 
     def test15BaseSSHKeyAdded(self):
+        # calling self.login() ensures there is added public ssh key to user to be able to call
+        # machine.execute(...)
         self.login()
         self.logout()
         out = self.machine.execute("hostname")
diff --git a/test/avocado/selenium-docker.py b/test/avocado/selenium-docker.py
@@ -7,7 +7,7 @@
 if not machine_test_dir in sys.path:
     sys.path.insert(1, machine_test_dir)
 
-from seleniumlib import SeleniumTest, clickable, invisible
+from testlib_avocado.seleniumlib import SeleniumTest, clickable, invisible
 
 class DockerTestSuite(SeleniumTest):
     """
diff --git a/test/avocado/selenium-navigate.py b/test/avocado/selenium-navigate.py
@@ -8,7 +8,7 @@
 if not machine_test_dir in sys.path:
     sys.path.insert(1, machine_test_dir)
 
-from seleniumlib import SeleniumTest, clickable, visible
+from testlib_avocado.seleniumlib import SeleniumTest, clickable, visible
 
 class NavigateTestSuite(SeleniumTest):
     """
diff --git a/test/avocado/selenium-sosreport.py b/test/avocado/selenium-sosreport.py
@@ -9,8 +9,8 @@
 if not machine_test_dir in sys.path:
     sys.path.insert(1, machine_test_dir)
 
-from seleniumlib import SeleniumTest, clickable
-from timeoutlib import Retry
+from testlib_avocado.seleniumlib import SeleniumTest, clickable
+from testlib_avocado.timeoutlib import Retry
 
 class SosReportingTab(SeleniumTest):
     """
diff --git a/test/avocado/selenium-storage.py b/test/avocado/selenium-storage.py
@@ -7,9 +7,8 @@
 if not machine_test_dir in sys.path:
     sys.path.insert(1, machine_test_dir)
 
-from avocado import main
-import libdisc
-from seleniumlib import *
+from testlib_avocado import libdisc
+from testlib_avocado.seleniumlib import SeleniumTest, clickable
 
 class StorageTestSuite(SeleniumTest):
     """
@@ -31,7 +30,5 @@ def test10Storage(self):
         self.click(self.wait_link('Storage', cond=clickable))
         self.wait_xpath("//*[@data-testkey='%s']" % other_shortname)
         self.mainframe()
-        self.error=False
+        self.error = False
 
-if __name__ == '__main__':
-    main()
diff --git a/test/avocado/testlib_avocado/__init__.py b/test/avocado/testlib_avocado/__init__.py
diff --git a/test/avocado/testlib_avocado/cockpit.py b/test/avocado/testlib_avocado/cockpit.py
@@ -19,21 +19,15 @@
 
 import os
 import re
-import sys
 import subprocess
 import shutil
-
 from avocado.utils import process
 
-CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
-if CURRENT_DIR not in sys.path:
-    sys.path.insert(1, CURRENT_DIR)
+from . import parent
+from .common.testlib import Browser
 
-import parent
 parent  # pyflakes
 
-from testlib import Browser
-
 class Cockpit():
 
     def __init__(self,):
diff --git a/test/avocado/testlib_avocado/common b/test/avocado/testlib_avocado/common
@@ -0,0 +1 @@
+../../common
diff --git a/test/avocado/testlib_avocado/identity b/test/avocado/testlib_avocado/identity
@@ -0,0 +1 @@
+../../../bots/machine/identity
diff --git a/test/avocado/testlib_avocado/identity.pub b/test/avocado/testlib_avocado/identity.pub
@@ -0,0 +1 @@
+../../../bots/machine/identity.pub
diff --git a/test/avocado/testlib_avocado/libdisc.py b/test/avocado/testlib_avocado/libdisc.py
@@ -24,7 +24,7 @@
 # usecase:
 # import libdisc; a=libdisc.Disc('cockpit'); print a.adddisc('disc1'); print a.adddisc('disc2'); a.deldisc('disc2'); a.clear();"
 
-import  re
+import re
 from avocado.utils import process
 
 class Disc():
diff --git a/test/avocado/testlib_avocado/libnetwork.py b/test/avocado/testlib_avocado/libnetwork.py
@@ -23,7 +23,7 @@
 # usecase:
 #  a=Network('brname'); a.addiface('x1'); DOWHATEWERYOUWANTWITHx1 ;a.clear()
 
-import  re
+import re
 from avocado.utils import process
 
 class Network():
diff --git a/test/avocado/testlib_avocado/machine_core b/test/avocado/testlib_avocado/machine_core
@@ -0,0 +1 @@
+../../../bots/machine/machine_core
diff --git a/test/avocado/testlib_avocado/parent.py b/test/avocado/testlib_avocado/parent.py
diff --git a/test/avocado/testlib_avocado/seleniumlib.py b/test/avocado/testlib_avocado/seleniumlib.py
@@ -32,8 +32,8 @@
 import os
 import time
 from avocado import Test
-from timeoutlib import Retry
-from machine_core import ssh_connection
+from .timeoutlib import Retry
+from .machine_core import ssh_connection
 
 user = "test"
 passwd = "superhardpasswordtest5554"
diff --git a/test/avocado/testlib_avocado/timeoutlib.py b/test/avocado/testlib_avocado/timeoutlib.py
