diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b1ce1697d2a..7a1bdc9284f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,11 +38,14 @@ jobs: seleniumbase install geckodriver displayName: 'Install chromedriver and geckodriver (Firefox Webdriver)' - - script: pytest examples/my_first_test.py --browser=chrome --headless -v -s --doctest-modules --junitxml=junit/test-results.xml - displayName: 'pytest examples/my_first_test.py --browser=chrome --headless' + - script: pytest examples/boilerplates/boilerplate_test.py --browser=chrome --headless -v -s --junitxml=junit/test-results.xml + displayName: 'Run pytest boilerplate_test.py --browser=chrome --headless' - - script: pytest examples/my_first_test.py --browser=firefox --headless -v -s --doctest-modules --junitxml=junit/test-results.xml - displayName: 'pytest examples/my_first_test.py --browser=firefox --headless' + - script: pytest examples/my_first_test.py --browser=chrome --headless -v -s --junitxml=junit/test-results.xml + displayName: 'Run pytest my_first_test.py --browser=chrome --headless' + + - script: pytest examples/my_first_test.py --browser=firefox --headless -v -s --junitxml=junit/test-results.xml + displayName: 'Run pytest my_first_test.py --browser=firefox --headless' - task: PublishTestResults@2 inputs: diff --git a/integrations/google_cloud/ReadMe.md b/integrations/google_cloud/ReadMe.md index b1cfaa1d821..6df79465468 100755 --- a/integrations/google_cloud/ReadMe.md +++ b/integrations/google_cloud/ReadMe.md @@ -36,10 +36,10 @@ sudo git clone https://github.com/seleniumbase/SeleniumBase.git cd SeleniumBase/integrations/linux/ ``` -#### Step 6. Give Jenkins (aka "tomcat" user) sudo access (See [jenkins_permissions.sh](https://github.com/seleniumbase/SeleniumBase/blob/master/integrations/linux/jenkins_permissions.sh) for details) +#### Step 6. Give Jenkins (aka "tomcat" user) sudo access (See [tomcat_permissions.sh](https://github.com/seleniumbase/SeleniumBase/blob/master/integrations/linux/tomcat_permissions.sh) for details) ```bash -./jenkins_permissions.sh +./tomcat_permissions.sh ``` #### Step 7. Become "tomcat" (the Jenkins user) and enter a "bash" shell diff --git a/integrations/linux/jenkins_permissions.sh b/integrations/linux/jenkins_permissions.sh index 9316219b9ff..7f5d182fe76 100755 --- a/integrations/linux/jenkins_permissions.sh +++ b/integrations/linux/jenkins_permissions.sh @@ -1,10 +1,9 @@ -# This file will add "tomcat" to the sudoers file. -# "tomcat" is the Jenkins user name by default +# This file will add "jenkins" to the sudoers file. -# To become tomcat from a different user, use the following: -# sudo su tomcat +# To become jenkins from a different user, use the following: +# sudo su jenkins # bash -sudo sh -c "echo \"%tomcat ALL=(ALL:ALL) ALL\" >> /etc/sudoers" -sudo sh -c "echo \"%tomcat ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers" -sudo sh -c "echo \"tomcat ALL=NOPASSWD: ALL\" >> /etc/sudoers" +sudo sh -c "echo \"%jenkins ALL=(ALL:ALL) ALL\" >> /etc/sudoers" +sudo sh -c "echo \"%jenkins ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers" +sudo sh -c "echo \"jenkins ALL=NOPASSWD: ALL\" >> /etc/sudoers" diff --git a/integrations/linux/tomcat_permissions.sh b/integrations/linux/tomcat_permissions.sh new file mode 100755 index 00000000000..a754d43a761 --- /dev/null +++ b/integrations/linux/tomcat_permissions.sh @@ -0,0 +1,10 @@ +# This file will add "tomcat" to the sudoers file. +# "tomcat" is the Jenkins user name by default on Bitnami Jenkins machines + +# To become tomcat from a different user, use the following: +# sudo su tomcat +# bash + +sudo sh -c "echo \"%tomcat ALL=(ALL:ALL) ALL\" >> /etc/sudoers" +sudo sh -c "echo \"%tomcat ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers" +sudo sh -c "echo \"tomcat ALL=NOPASSWD: ALL\" >> /etc/sudoers" diff --git a/requirements.txt b/requirements.txt index d5fd6569abb..0626cc24e1a 100755 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,7 @@ requests==2.21.0 urllib3==1.24.1 pytest>=4.4.0 pytest-cov>=2.6.1 +pytest-forked>=1.0.2 pytest-html>=1.20.0 pytest-metadata>=1.8.0 pytest-rerunfailures>=7.0 diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py index c3914f371de..f9da34546f0 100755 --- a/seleniumbase/core/browser_launcher.py +++ b/seleniumbase/core/browser_launcher.py @@ -107,6 +107,7 @@ def _set_chrome_options( } chrome_options.add_experimental_option("prefs", prefs) chrome_options.add_argument("--test-type") + chrome_options.add_argument("--log-level=3") chrome_options.add_argument("--no-first-run") chrome_options.add_argument("--ignore-certificate-errors") chrome_options.add_argument("--allow-file-access-from-files") diff --git a/setup.py b/setup.py index 8c1d2ea5753..1160323a41c 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='seleniumbase', - version='1.22.6', + version='1.22.7', description='Reliable Browser Automation & Testing Framework', long_description=long_description, long_description_content_type='text/markdown', @@ -63,6 +63,7 @@ 'urllib3==1.24.1', # Keep this lib in sync with "requests" 'pytest>=4.4.0', 'pytest-cov>=2.6.1', + 'pytest-forked>=1.0.2', 'pytest-html>=1.20.0', 'pytest-metadata>=1.8.0', 'pytest-rerunfailures>=7.0',