Skip to content

Commit 6ad3977

Browse files
authored
Merge pull request #310 from seleniumbase/some-minor-updates
Some minor updates
2 parents ecf25a8 + 68033c4 commit 6ad3977

File tree

7 files changed

+29
-14
lines changed

7 files changed

+29
-14
lines changed

azure-pipelines.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ jobs:
3838
seleniumbase install geckodriver
3939
displayName: 'Install chromedriver and geckodriver (Firefox Webdriver)'
4040
41-
- script: pytest examples/my_first_test.py --browser=chrome --headless -v -s --doctest-modules --junitxml=junit/test-results.xml
42-
displayName: 'pytest examples/my_first_test.py --browser=chrome --headless'
41+
- script: pytest examples/boilerplates/boilerplate_test.py --browser=chrome --headless -v -s --junitxml=junit/test-results.xml
42+
displayName: 'Run pytest boilerplate_test.py --browser=chrome --headless'
4343

44-
- script: pytest examples/my_first_test.py --browser=firefox --headless -v -s --doctest-modules --junitxml=junit/test-results.xml
45-
displayName: 'pytest examples/my_first_test.py --browser=firefox --headless'
44+
- script: pytest examples/my_first_test.py --browser=chrome --headless -v -s --junitxml=junit/test-results.xml
45+
displayName: 'Run pytest my_first_test.py --browser=chrome --headless'
46+
47+
- script: pytest examples/my_first_test.py --browser=firefox --headless -v -s --junitxml=junit/test-results.xml
48+
displayName: 'Run pytest my_first_test.py --browser=firefox --headless'
4649

4750
- task: PublishTestResults@2
4851
inputs:

integrations/google_cloud/ReadMe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ sudo git clone https://github.com/seleniumbase/SeleniumBase.git
3636
cd SeleniumBase/integrations/linux/
3737
```
3838

39-
#### 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)
39+
#### 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)
4040

4141
```bash
42-
./jenkins_permissions.sh
42+
./tomcat_permissions.sh
4343
```
4444

4545
#### Step 7. Become "tomcat" (the Jenkins user) and enter a "bash" shell
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# This file will add "tomcat" to the sudoers file.
2-
# "tomcat" is the Jenkins user name by default
1+
# This file will add "jenkins" to the sudoers file.
32

4-
# To become tomcat from a different user, use the following:
5-
# sudo su tomcat
3+
# To become jenkins from a different user, use the following:
4+
# sudo su jenkins
65
# bash
76

8-
sudo sh -c "echo \"%tomcat ALL=(ALL:ALL) ALL\" >> /etc/sudoers"
9-
sudo sh -c "echo \"%tomcat ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers"
10-
sudo sh -c "echo \"tomcat ALL=NOPASSWD: ALL\" >> /etc/sudoers"
7+
sudo sh -c "echo \"%jenkins ALL=(ALL:ALL) ALL\" >> /etc/sudoers"
8+
sudo sh -c "echo \"%jenkins ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers"
9+
sudo sh -c "echo \"jenkins ALL=NOPASSWD: ALL\" >> /etc/sudoers"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file will add "tomcat" to the sudoers file.
2+
# "tomcat" is the Jenkins user name by default on Bitnami Jenkins machines
3+
4+
# To become tomcat from a different user, use the following:
5+
# sudo su tomcat
6+
# bash
7+
8+
sudo sh -c "echo \"%tomcat ALL=(ALL:ALL) ALL\" >> /etc/sudoers"
9+
sudo sh -c "echo \"%tomcat ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers"
10+
sudo sh -c "echo \"tomcat ALL=NOPASSWD: ALL\" >> /etc/sudoers"

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ requests==2.21.0
1010
urllib3==1.24.1
1111
pytest>=4.4.0
1212
pytest-cov>=2.6.1
13+
pytest-forked>=1.0.2
1314
pytest-html>=1.20.0
1415
pytest-metadata>=1.8.0
1516
pytest-rerunfailures>=7.0

seleniumbase/core/browser_launcher.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def _set_chrome_options(
107107
}
108108
chrome_options.add_experimental_option("prefs", prefs)
109109
chrome_options.add_argument("--test-type")
110+
chrome_options.add_argument("--log-level=3")
110111
chrome_options.add_argument("--no-first-run")
111112
chrome_options.add_argument("--ignore-certificate-errors")
112113
chrome_options.add_argument("--allow-file-access-from-files")

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
setup(
1919
name='seleniumbase',
20-
version='1.22.6',
20+
version='1.22.7',
2121
description='Reliable Browser Automation & Testing Framework',
2222
long_description=long_description,
2323
long_description_content_type='text/markdown',
@@ -63,6 +63,7 @@
6363
'urllib3==1.24.1', # Keep this lib in sync with "requests"
6464
'pytest>=4.4.0',
6565
'pytest-cov>=2.6.1',
66+
'pytest-forked>=1.0.2',
6667
'pytest-html>=1.20.0',
6768
'pytest-metadata>=1.8.0',
6869
'pytest-rerunfailures>=7.0',

0 commit comments

Comments
 (0)